From 20ef64cae0b518e2912b0361f36837071a6e7719 Mon Sep 17 00:00:00 2001 From: krad Date: Thu, 3 Sep 2015 14:53:33 -0700 Subject: [PATCH] Moving jobs to use gcc-4.9 Summary: Fixed the glitch in Sandcastle and added gcc-4.9 support. Moving the jobs to 4.9 Test Plan: Manually run the script Reviewers: sdon igor CC: leveldb@ Task ID: #6968635 Blame Rev: --- build_tools/rocksdb-lego-determinator | 37 ++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator index d651c6c865..0bb12b3dd7 100755 --- a/build_tools/rocksdb-lego-determinator +++ b/build_tools/rocksdb-lego-determinator @@ -11,7 +11,7 @@ UNIT_TEST_COMMANDS="[ 'steps': [ { 'name':'Build RocksDB', - 'shell':'ROCKSDB_FBCODE_BUILD_WITH_481=1 make clean all', + 'shell':'make -j$(nproc) clean all', 'user':'root' }, { @@ -23,6 +23,28 @@ UNIT_TEST_COMMANDS="[ } ]" +# +# RocksDB unit test on gcc-4.8.1 +# +UNIT_TEST_COMMANDS_481="[ + { + 'name':'Rocksdb Unit Test', + 'steps': [ + { + 'name':'Build RocksDB', + 'shell':'ROCKSDB_FBCODE_BUILD_WITH_481=1 make -j$(nproc) clean all', + 'user':'root' + }, + { + 'name':'Test RocksDB', + 'shell':'make J=1 check', + 'user':'root' + } + ], + } +]" + + # # RocksDB stress/crash test # @@ -32,12 +54,12 @@ STRESS_CRASH_TEST_COMMANDS="[ 'steps': [ { 'name':'Build and run RocksDB stress tests', - 'shell':'ROCKSDB_FBCODE_BUILD_WITH_481=1 TEST_TMPDIR=/dev/shm make clean db_stress', + 'shell':'TEST_TMPDIR=/dev/shm make -j$(nproc) clean db_stress', 'user':'root' }, { 'name':'Build and run RocksDB crash tests', - 'shell':'ROCKSDB_FBCODE_BUILD_WITH_481=1 TEST_TMPDIR=/dev/shm make crash_test', + 'shell':'TEST_TMPDIR=/dev/shm make crash_test', 'user':'root' } ], @@ -54,12 +76,12 @@ ASAN_TEST_COMMANDS="[ 'steps': [ { 'name':'Build RocksDB for ASAN', - 'shell':'set -o pipefail && ROCKSDB_FBCODE_BUILD_WITH_481=1 COMPILE_WITH_ASAN=1 make -j$(nproc) clean all', + 'shell':'COMPILE_WITH_ASAN=1 make -j$(nproc) clean all', 'user':'root' }, { 'name':'Test RocksDB under ASAN', - 'shell':'make J=1 asan_check |& /usr/facebook/ops/scripts/asan_symbolize.py -d', + 'shell':'set -o pipefail && make J=1 asan_check |& /usr/facebook/ops/scripts/asan_symbolize.py -d', 'user':'root' } ], @@ -75,7 +97,7 @@ ASAN_CRASH_TEST_COMMANDS="[ 'steps': [ { 'name':'Build and run RocksDB asan_crash_test', - 'shell':'ROCKSDB_FBCODE_BUILD_WITH_481=1 make -j$(nproc) clean asan_crash_test', + 'shell':'make -j$(nproc) J=1 clean asan_crash_test', 'user':'root' }, ], @@ -108,6 +130,9 @@ case $1 in unit) echo $UNIT_TEST_COMMANDS ;; + unit_481) + echo $UNIT_TEST_COMMANDS_481 + ;; stress_crash) echo $STRESS_CRASH_TEST_COMMANDS ;;