From c29666a19c1ec4ce97fb23271571759847698586 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 19 Dec 2019 17:27:04 -0700 Subject: [PATCH] autobuild.sh: make basic functions use run_test. run_test already calls report_test_completion so where we were calling report_test_completion, we can now just echo out that we are using valgrind or the other tools and run_test will take care of the rest. Change-Id: I24bef432599fe7e8deaa1011ccff0140d36dc731 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478543 Community-CI: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Karol Latecki Tested-by: SPDK CI Jenkins --- autobuild.sh | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index c77a1bea5..b7cfd45d7 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -42,13 +42,22 @@ $MAKE cc_version $MAKE cxx_version echo "** END ** Info for Hostname: $HOSTNAME" -timing_enter autobuild - -timing_enter check_format -if [ $SPDK_RUN_CHECK_FORMAT -eq 1 ]; then - ./scripts/check_format.sh +if [ $SPDK_RUN_VALGRIND -eq 1 ]; then + run_test "valgrind" echo "using valgrind" +fi + +if [ $SPDK_RUN_ASAN -eq 1 ]; then + run_test "asan" echo "using asan" +fi + +if [ $SPDK_RUN_UBSAN -eq 1 ]; then + run_test "ubsan" echo "using ubsan" +fi + +timing_enter autobuild +if [ $SPDK_RUN_CHECK_FORMAT -eq 1 ]; then + run_test "autobuild_check_format" ./scripts/check_format.sh fi -timing_exit check_format scanbuild='' make_timing_label='make' @@ -59,18 +68,6 @@ if [ $SPDK_RUN_SCANBUILD -eq 1 ] && hash scan-build; then fi -if [ $SPDK_RUN_VALGRIND -eq 1 ]; then - report_test_completion "valgrind" -fi - -if [ $SPDK_RUN_ASAN -eq 1 ]; then - report_test_completion "asan" -fi - -if [ $SPDK_RUN_UBSAN -eq 1 ]; then - report_test_completion "ubsan" -fi - echo $scanbuild timing_enter "$make_timing_label"