From 7db1471cc102f91772c1b388f48aa91edfdd7826 Mon Sep 17 00:00:00 2001 From: krad Date: Thu, 10 Sep 2015 18:49:09 -0700 Subject: [PATCH] Minor fix to CI job Summary: Fix the issue where compilation error will not result in log file not found error Test Plan: None Reviewers: sdong igor CC: leveldb@ Task ID: #6968635 Blame Rev: --- build_tools/rocksdb-lego-determinator | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator index dc32b84df..644d80b54 100755 --- a/build_tools/rocksdb-lego-determinator +++ b/build_tools/rocksdb-lego-determinator @@ -40,13 +40,23 @@ PARALLEL_UNIT_TEST_COMMANDS="[ $CLEANUP_ENV, { 'name':'Build and test RocksDB debug version', - 'shell':'$SHM $DEBUG make check 2>&1 > /dev/null || cat t/log-*', + 'shell':'$DEBUG make -j$(nproc) all && $SHM make check > /dev/null 2>&1', + 'user':'root' + }, + { + 'name':'Print logs', + 'shell':'cat t/log-*', 'user':'root' }, $CLEANUP_ENV, { 'name':'Build and test RocksDB debug version under gcc-4.8.1', - 'shell':'$SHM $GCC_481 $DEBUG make check 2>&1 > /dev/null || cat t/log-*', + 'shell':'$GCC_481 $DEBUG make -j$(nproc) all && $SHM make check > /dev/null 2>&1', + 'user':'root' + }, + { + 'name':'Print logs', + 'shell':'cat t/log-*', 'user':'root' }, ], @@ -100,7 +110,7 @@ CLANG_UNIT_TEST_COMMANDS="[ $CLEANUP_ENV, { 'name':'Build and test RocksDB debug', - 'shell':'$CLANG $SHM $DEBUG make check', + 'shell':'$CLANG $SHM $DEBUG make J=1 check', 'user':'root' }, ],