ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autobuild.sh: move make under run_test.

Browse Source 
Change-Id: Iaba2303e34a57aeb6beeafe6e33ea2cb345fc129
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478545
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Seth Howell 2019-12-19 17:38:20 -07:00 committed by Tomasz Zawadzki
parent 06070794b6
commit 8e90ee663f
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
autobuild.sh
View File

@ -14,6 +14,7 @@ rootdir=$(readlink -f $(dirname $0))
source "$rootdir/test/common/autotest_common.sh" source "$rootdir/test/common/autotest_common.sh"
out=$PWD out=$PWD
scanbuild="scan-build -o $out/scan-build-tmp --status-bugs"
umask 022 umask 022
@ -43,6 +44,15 @@ function ocf_precompile {
./configure $config_params ./configure $config_params
} }
function make_fail_cleanup {
if [ -d $out/scan-build-tmp ]; then
scanoutput=$(ls -1 $out/scan-build-tmp/)
mv $out/scan-build-tmp/$scanoutput $out/scan-build
rm -rf $out/scan-build-tmp
chmod -R a+rX $out/scan-build
fi
false
}
if [ $SPDK_RUN_VALGRIND -eq 1 ]; then if [ $SPDK_RUN_VALGRIND -eq 1 ]; then
run_test "valgrind" echo "using valgrind" run_test "valgrind" echo "using valgrind"
@ -65,40 +75,18 @@ if [ $SPDK_RUN_CHECK_FORMAT -eq 1 ]; then
run_test "autobuild_check_format" ./scripts/check_format.sh run_test "autobuild_check_format" ./scripts/check_format.sh
fi fi
scanbuild=''
make_timing_label='make'
if [ $SPDK_RUN_SCANBUILD -eq 1 ] && hash scan-build; then
scanbuild="scan-build -o $out/scan-build-tmp --status-bugs"
make_timing_label='scanbuild_make'
report_test_completion "scanbuild"
fi
echo $scanbuild
timing_enter "$make_timing_label"
$MAKE $MAKEFLAGS clean $MAKE $MAKEFLAGS clean
if [ $SPDK_BUILD_SHARED_OBJECT -eq 1 ]; then if [ $SPDK_BUILD_SHARED_OBJECT -eq 1 ]; then
$rootdir/test/make/check_so_deps.sh $rootdir/test/make/check_so_deps.sh
report_test_completion "shared_object_build" report_test_completion "shared_object_build"
fi fi
fail=0 run_test "configure" ./configure $config_params
./configure $config_params if [ $SPDK_RUN_SCANBUILD -eq 1 ] && hash scan-build; then
time $scanbuild $MAKE $MAKEFLAGS || fail=1 run_test "scanbuild_make" $scanbuild $MAKE $MAKEFLAGS && rm -rf $out/scan-build-tmp || make_fail_cleanup
if [ $fail -eq 1 ]; then
if [ -d $out/scan-build-tmp ]; then
scanoutput=$(ls -1 $out/scan-build-tmp/)
mv $out/scan-build-tmp/$scanoutput $out/scan-build
rm -rf $out/scan-build-tmp
chmod -R a+rX $out/scan-build
fi
exit 1
else else
rm -rf $out/scan-build-tmp run_test "make" $MAKE $MAKEFLAGS
fi fi
timing_exit "$make_timing_label"
# Check for generated files that are not listed in .gitignore # Check for generated files that are not listed in .gitignore
timing_enter generated_files_check timing_enter generated_files_check