From 32de1f6aa42637c5f3f19ae746e930dc406554e0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 30 Jun 2017 11:11:05 +1200 Subject: [PATCH] autobuild: Use new selftest.pl feature to run only some environments This is cleaner than test filtering with regular expressions Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- script/autobuild.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/autobuild.py b/script/autobuild.py index e4a52ee7ff5..a4ad5441c51 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -93,11 +93,11 @@ tasks = { " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xa/ab" + samba_configure_params, "text/plain"), ("compare-results", "script/compare_cc_results.py ./bin/c4che/default.cache.py ./bin-xe/c4che/default.cache.py ./bin-xa/c4che/default.cache.py", "text/plain")], - # test build with -O3 -- catches extra warnings and bugs + # test build with -O3 -- catches extra warnings and bugs, tests the ad_dc environments "samba-o3" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), ("configure", "ADDITIONAL_CFLAGS='-O3' ./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"), ("make", "make -j", "text/plain"), - ("test", "make quicktest FAIL_IMMEDIATELY=1 TESTS='\(ad_dc\)'", "text/plain"), + ("test", "make quicktest FAIL_IMMEDIATELY=1 TESTS='--include-env=ad_dc'", "text/plain"), ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], @@ -173,7 +173,7 @@ tasks = { ("make", "make -j", "text/plain"), # we currently cannot run a full make test, a limited list of tests could be run # via "make test TESTS=sometests" - ("test", "make test FAIL_IMMEDIATELY=1 TESTS='samba3.*ktest'", "text/plain"), + ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=ktest'", "text/plain"), ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain")