Fix to CI jobs.

Summary: The approach to serialize long scripts as string is flawed. Instead
adding args to invoke the long scripts.

Test Plan: Manual test

Reviewers:

CC: leveldb@

Task ID: #6968635

Blame Rev:
main
krad 10 years ago
parent 3bcc072d24
commit 4d6eb52d1a
  1. 35
      build_tools/rocksdb-lego-determinator

@ -325,13 +325,13 @@ TSAN_CRASH_TEST_COMMANDS="[
# RocksDB format compatible # RocksDB format compatible
# #
SCRIPT=' run_format_compatible()
{
export TEST_TMPDIR=/dev/shm/rocksdb export TEST_TMPDIR=/dev/shm/rocksdb
rm -rf /dev/shm/rocksdb rm -rf /dev/shm/rocksdb
mkdir /dev/shm/rocksdb mkdir /dev/shm/rocksdb
echo " echo '
if [ -e "build_tools/build_detect_platform" ] if [ -e "build_tools/build_detect_platform" ]
then then
sed "s/tcmalloc/nothingnothingnothing/g" build_tools/build_detect_platform > $TEST_TMPDIR/temp_build_file sed "s/tcmalloc/nothingnothingnothing/g" build_tools/build_detect_platform > $TEST_TMPDIR/temp_build_file
@ -359,12 +359,12 @@ if [ -e "build_tools/build_detect_platform" ]
then then
git checkout -- build_tools/build_detect_platform git checkout -- build_tools/build_detect_platform
fi fi
" > temp_build_ldb.sh ' > temp_build_ldb.sh
sed "s/make ldb -j32/source temp_build_ldb.sh/g" tools/check_format_compatible.sh > tools/temp_check_format_compatible.sh sed "s/make ldb -j32/source temp_build_ldb.sh/g" tools/check_format_compatible.sh > tools/temp_check_format_compatible.sh
chmod +x tools/temp_check_format_compatible.sh chmod +x tools/temp_check_format_compatible.sh
tools/temp_check_format_compatible.sh tools/temp_check_format_compatible.sh
' }
FORMAT_COMPATIBLE_COMMANDS="[ FORMAT_COMPATIBLE_COMMANDS="[
{ {
@ -374,7 +374,7 @@ FORMAT_COMPATIBLE_COMMANDS="[
$CLEANUP_ENV, $CLEANUP_ENV,
{ {
'name':'Run RocksDB debug unit test', 'name':'Run RocksDB debug unit test',
'shell':'echo \'$SCRIPT\' > .legocmd && cat .legocmd && bash .legocmd', 'shell':'build_tools/rocksdb-lego-determinator run_format_compatible',
'user':'root' 'user':'root'
}, },
], ],
@ -384,7 +384,8 @@ FORMAT_COMPATIBLE_COMMANDS="[
# #
# RocksDB no compression # RocksDB no compression
# #
SCRIPT=' run_no_compression()
{
export TEST_TMPDIR=/dev/shm/rocksdb export TEST_TMPDIR=/dev/shm/rocksdb
rm -rf /dev/shm/rocksdb rm -rf /dev/shm/rocksdb
mkdir /dev/shm/rocksdb mkdir /dev/shm/rocksdb
@ -395,7 +396,7 @@ mv .tmp.fbcode_config.sh build_tools/fbcode_config.sh
cat Makefile | grep -v tools/ldb_test.py > .tmp.Makefile cat Makefile | grep -v tools/ldb_test.py > .tmp.Makefile
mv .tmp.Makefile Makefile mv .tmp.Makefile Makefile
make $DEBUG J=1 check make $DEBUG J=1 check
' }
NO_COMPRESSION_COMMANDS="[ NO_COMPRESSION_COMMANDS="[
{ {
@ -405,7 +406,7 @@ NO_COMPRESSION_COMMANDS="[
$CLEANUP_ENV, $CLEANUP_ENV,
{ {
'name':'Run RocksDB debug unit test', 'name':'Run RocksDB debug unit test',
'shell':'echo \'$SCRIPT\' > .legocmd && cat .legocmd && bash .legocmd', 'shell':'build_tools/rocksdb-lego-determinator run_no_compression',
'user':'root' 'user':'root'
}, },
], ],
@ -415,7 +416,8 @@ NO_COMPRESSION_COMMANDS="[
# #
# RocksDB regression # RocksDB regression
# #
SCRIPT=' run_regression()
{
time -v bash -vx ./build_tools/regression_build_test.sh $(mktemp -d $WORKSPACE/leveldb.XXXX) $(mktemp leveldb_test_stats.XXXX) time -v bash -vx ./build_tools/regression_build_test.sh $(mktemp -d $WORKSPACE/leveldb.XXXX) $(mktemp leveldb_test_stats.XXXX)
# ======= report size to ODS ======== # ======= report size to ODS ========
@ -449,7 +451,7 @@ OPT=-DROCKSDB_LITE make -j$(nproc) shared_lib
send_size_to_ods shared_lib_lite $(stat --printf="%s" `readlink -f librocksdb.so`) send_size_to_ods shared_lib_lite $(stat --printf="%s" `readlink -f librocksdb.so`)
strip `readlink -f librocksdb.so` strip `readlink -f librocksdb.so`
send_size_to_ods shared_lib_lite_stripped $(stat --printf="%s" `readlink -f librocksdb.so`) send_size_to_ods shared_lib_lite_stripped $(stat --printf="%s" `readlink -f librocksdb.so`)
' }
REGRESSION_COMMANDS="[ REGRESSION_COMMANDS="[
{ {
@ -459,7 +461,7 @@ REGRESSION_COMMANDS="[
$CLEANUP_ENV, $CLEANUP_ENV,
{ {
'name':'Make and run script', 'name':'Make and run script',
'shell':'echo \'$SCRIPT\' > .legocmd && cat .legocmd && bash .legocmd', 'shell':'build_tools/rocksdb-lego-determinator run_regression',
'user':'root' 'user':'root'
}, },
], ],
@ -512,12 +514,21 @@ case $1 in
format_compatible) format_compatible)
echo $FORMAT_COMPATIBLE_COMMANDS echo $FORMAT_COMPATIBLE_COMMANDS
;; ;;
run_format_compatible)
run_format_compatible
;;
no_compression) no_compression)
echo $NO_COMPRESSION_COMMANDS echo $NO_COMPRESSION_COMMANDS
;; ;;
run_no_compression)
run_no_compression
;;
regression) regression)
echo $REGRESSION_COMMANDS echo $REGRESSION_COMMANDS
;; ;;
run_regression)
run_regression
;;
*) *)
echo "Invalid determinator command" echo "Invalid determinator command"
;; ;;

Loading…
Cancel
Save