From 274f52b52707d78027c7fe32737cf851d5cba807 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 10 Mar 2021 10:06:40 +0100 Subject: [PATCH] autobuild: Separate unit tests from autobuild Signed-off-by: Michal Berger Change-Id: If6ce4d3f7bc58855ba61b352be71dff404c87720 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6819 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- autobuild.sh | 9 ++++++++- autorun.sh | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 686543f10..28dcc7209 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -278,6 +278,11 @@ function autobuild_test_suite() { run_test "autobuild_build_doc" build_doc } +function unittest_build() { + "$rootdir/configure" $config_params --without-shared + $MAKE $MAKEFLAGS +} + if [ $SPDK_RUN_VALGRIND -eq 1 ]; then run_test "valgrind" echo "using valgrind" fi @@ -301,8 +306,10 @@ $MAKE cc_version $MAKE cxx_version echo "** END ** Info for Hostname: $HOSTNAME" -if [ "$SPDK_TEST_AUTOBUILD" -eq 1 ]; then +if [[ $SPDK_TEST_AUTOBUILD -eq 1 ]]; then run_test "autobuild" autobuild_test_suite $1 +elif [[ $SPDK_TEST_UNITTEST -eq 1 ]]; then + run_test "unittest_build" unittest_build else if [ "$SPDK_TEST_OCF" -eq 1 ]; then run_test "autobuild_ocf_precompile" ocf_precompile diff --git a/autorun.sh b/autorun.sh index c85fdb217..9b5207e1a 100755 --- a/autorun.sh +++ b/autorun.sh @@ -12,11 +12,14 @@ if [[ ! -f $conf ]]; then echo "ERROR: $conf doesn't exist" exit 1 fi +source "$conf" echo "Test configuration:" cat "$conf" # Runs agent scripts $rootdir/autobuild.sh "$conf" -sudo -E $rootdir/autotest.sh "$conf" +if ((SPDK_TEST_UNITTEST == 1 || SPDK_RUN_FUNCTIONAL_TEST == 1)); then + sudo -E $rootdir/autotest.sh "$conf" +fi $rootdir/autopackage.sh "$conf"