This is an archive of the discontinued LLVM Phabricator instance.

Differential D38823

Use check-all on the android buildbot
ClosedPublic

Authored by eugenis on Oct 11 2017, 2:29 PM.

Details

Reviewers
vitalybuka
Summary

Build/test all of compiler-rt as a single step using check-all.
This reduces the number of steps on the buildbot page, and automatically picks up any new tests (like ubsan-minimal).

It would be great if the "unit" tests could also run through lit. This is out of scope of this change.

Diff Detail

Repository
rL LLVM

Event Timeline

eugenis created this revision.Oct 11 2017, 2:29 PM
Herald added a subscriber: srhines. · View Herald TranscriptOct 11 2017, 2:29 PM
eugenis updated this revision to Diff 118699.Oct 11 2017, 2:30 PM
vitalybuka accepted this revision.Oct 11 2017, 2:31 PM

Awesome

buildbot_android_functions.sh
181

Could you please remove commented lines

This revision is now accepted and ready to land.Oct 11 2017, 2:31 PM
vitalybuka added inline comments.Oct 11 2017, 2:32 PM
buildbot_android_functions.sh
181

Done.

eugenis updated this revision to Diff 118702.Oct 11 2017, 2:42 PM

Use "clang -print-resource-dir" instead of "find".

eugenis closed this revision.Oct 11 2017, 3:16 PM

r315521.

Revision Contents

Diff 118699

buildbot_android_functions.sh

Context not available.
wait wait
echo @@@BUILD_STEP build android/$_arch@@@ echo @@@BUILD_STEP build android/$_arch@@@
ninja -C llvm_build_android_$_arch llvm-symbolizer || echo @@@STEP_FAILURE@@@ ninja -C llvm_build_android_$_arch llvm-symbolizer || echo @@@STEP_FAILURE@@@
ninja -C compiler_rt_build_android_$_arch compiler-rt AsanUnitTests SanitizerUnitTests || echo @@@STEP_FAILURE@@@ ninja -C compiler_rt_build_android_$_arch || echo @@@STEP_FAILURE@@@
} }
# If a multiarch device has x86 as the first arch, remove everything else from # If a multiarch device has x86 as the first arch, remove everything else from
Context not available.
ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch
LIBCXX_SHARED=$(find $ANDROID_TOOLCHAIN/ -name libc++_shared.so | head -1) LIBCXX_SHARED=$(find $ANDROID_TOOLCHAIN/ -name libc++_shared.so | head -1)
SYMBOLIZER_BIN=$ROOT/llvm_build_android_$_arch/bin/llvm-symbolizer SYMBOLIZER_BIN=$ROOT/llvm_build_android_$_arch/bin/llvm-symbolizer
ASAN_RT=$(find $ROOT/llvm_build64/lib/ -name libclang_rt.asan-$_arch-android.so) RT_DIR=$ROOT/llvm_build64/lib/clang/*/lib/linux
UBSAN_RT=$(find $ROOT/llvm_build64/lib/ -name libclang_rt.ubsan_standalone-$_arch-android.so)
COMPILER_RT_BUILD_DIR=$ROOT/compiler_rt_build_android_$_arch COMPILER_RT_BUILD_DIR=$ROOT/compiler_rt_build_android_$_arch
vitalybukaUnsubmitted
Not Done
ReplyInline Actions

Could you please remove commented lines

vitalybuka: Could you please remove commented lines
vitalybukaUnsubmitted
Not Done
ReplyInline Actions

Done.

vitalybuka: Done.
export ADB=adb export ADB=adb
export DEVICE_ROOT=/data/local/tmp/Output export DEVICE_ROOT=/data/local/tmp/Output
Context not available.
$ADB shell rm -rf $DEVICE_ROOT $ADB shell rm -rf $DEVICE_ROOT
$ADB shell mkdir $DEVICE_ROOT $ADB shell mkdir $DEVICE_ROOT
$ADB push $SYMBOLIZER_BIN $DEVICE_ROOT/ & $ADB push $SYMBOLIZER_BIN $DEVICE_ROOT/ &
$ADB push $ASAN_RT $DEVICE_ROOT/ & $ADB push "$RT_DIR/libclang_rt.*-android.so" $DEVICE_ROOT/ &
$ADB push $UBSAN_RT $DEVICE_ROOT/ &
$ADB push $LIBCXX_SHARED $DEVICE_ROOT/ & $ADB push $LIBCXX_SHARED $DEVICE_ROOT/ &
$ADB push $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest $DEVICE_ROOT/ & $ADB push $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest $DEVICE_ROOT/ &
$ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanTest $DEVICE_ROOT/ & $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanTest $DEVICE_ROOT/ &
Context not available.
$ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest $DEVICE_ROOT/ & $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest $DEVICE_ROOT/ &
wait wait
echo @@@BUILD_STEP run sanitizer lit tests [$DEVICE_DESCRIPTION]@@@ echo @@@BUILD_STEP run lit tests [$DEVICE_DESCRIPTION]@@@
(cd $COMPILER_RT_BUILD_DIR && ninja check-sanitizer) || echo @@@STEP_FAILURE@@@ (cd $COMPILER_RT_BUILD_DIR && ninja check-all) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP run asan lit tests [$DEVICE_DESCRIPTION]@@@
(cd $COMPILER_RT_BUILD_DIR && ninja check-asan) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP run ubsan lit tests [$DEVICE_DESCRIPTION]@@@
(cd $COMPILER_RT_BUILD_DIR && ninja check-ubsan) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP run cfi lit tests [$DEVICE_DESCRIPTION]@@@
(cd $COMPILER_RT_BUILD_DIR && ninja check-cfi) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP run scudo lit tests [$DEVICE_DESCRIPTION]@@@
(cd $COMPILER_RT_BUILD_DIR && ninja check-scudo) || echo @@@STEP_FAILURE@@@
echo @@@BUILD_STEP run sanitizer_common tests [$DEVICE_DESCRIPTION]@@@ echo @@@BUILD_STEP run sanitizer_common tests [$DEVICE_DESCRIPTION]@@@
run_command_on_device "LD_LIBRARY_PATH=$DEVICE_ROOT $DEVICE_ROOT/SanitizerTest" || echo @@@STEP_FAILURE@@@ run_command_on_device "LD_LIBRARY_PATH=$DEVICE_ROOT $DEVICE_ROOT/SanitizerTest" || echo @@@STEP_FAILURE@@@
Context not available.