diff options
author | Stefan Metzmacher <metze@samba.org> | 2020-11-19 14:41:16 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2021-04-13 08:23:35 +0000 |
commit | 2933c02718c81d858e73dca08e5237efc36a3e28 (patch) | |
tree | e997784f4a506cae65a1d3caf5032fb787711798 /script | |
parent | 0e7a7440f7cc44a8e18942048527b3152e26e0eb (diff) | |
download | samba-2933c02718c81d858e73dca08e5237efc36a3e28.tar.gz |
script/autobuild.py: split out a CLEAN_SOURCE_TREE_CMD
This works for all cases even if the builder runs in a subdirectory.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'script')
-rwxr-xr-x | script/autobuild.py | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index f4c1c92ae4c..ceb88e06804 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -113,6 +113,8 @@ if options.enable_coverage: else: LCOV_CMD = 'echo "lcov skipped since no --enable-coverage specified"' +CLEAN_SOURCE_TREE_CMD = "cd ${TEST_SOURCE_DIR} && script/clean-source-tree.sh" + if args: # If we are only running specific test, # do not sleep randomly to wait for it to start @@ -193,7 +195,7 @@ tasks = { ("make", "make all"), ("install", "make install"), ("test", "make autotest"), - ("check-clean-tree", "../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ], }, @@ -266,7 +268,7 @@ tasks = { ("test-slow-none", make_test(cmd='make test', TESTS="--include=selftest/slow-none", include_envs=["none"])), ("lcov", LCOV_CMD), ("install", "make install"), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ], }, @@ -330,7 +332,7 @@ tasks = { ])), ("lcov", LCOV_CMD), ("install", "make install"), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ], }, @@ -349,7 +351,7 @@ tasks = { "simpleserver", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ], }, @@ -368,7 +370,7 @@ tasks = { # but is tested here against a system Heimdal ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -384,7 +386,7 @@ tasks = { "ad_member_rfc2307", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -424,7 +426,7 @@ tasks = { "ad_dc_no_ntlm", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -439,7 +441,7 @@ tasks = { "rodc", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -455,7 +457,7 @@ tasks = { "proclimitdc", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -471,7 +473,7 @@ tasks = { "fl2008r2dc", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -483,7 +485,7 @@ tasks = { ("test", make_test(include_envs=[ "ad_dc_default", "ad_dc_default_smb1", "ad_dc_default_smb1_done"])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -494,7 +496,7 @@ tasks = { ("make", "make -j"), ("test", make_test(include_envs=["ad_dc_slowtests"])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -505,7 +507,7 @@ tasks = { ("make", "make -j"), ("test", make_test(include_envs=["schema_dc", "schema_pair_dc"])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -518,7 +520,7 @@ tasks = { ("make", "make -j"), ("test", make_test(include_envs=["ad_dc_ntvfs"])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -530,7 +532,7 @@ tasks = { ("make", "make -j"), ("test", make_test(include_envs=["ad_dc_fips", "ad_member_fips"])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -550,7 +552,7 @@ tasks = { "ad_dc_backup", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -566,7 +568,7 @@ tasks = { "ad_member_rfc2307", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -583,7 +585,7 @@ tasks = { "ad_dc_no_ntlm", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -599,7 +601,7 @@ tasks = { "fl2008r2dc", ])), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ], }, @@ -648,7 +650,7 @@ tasks = { ("quicktest", make_test(cmd='make quicktest', include_envs=["ad_dc", "ad_dc_smb1", "ad_dc_smb1_done"])), ("lcov", LCOV_CMD), ("install", "make install"), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ], }, @@ -683,7 +685,7 @@ tasks = { ), # clean up: - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ("ctdb-clean", "cd ./ctdb && make clean"), ], @@ -759,7 +761,7 @@ tasks = { ("find-python", "script/find_python.sh ${PREFIX}"), ("test", "make test-nopython"), ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"), @@ -782,7 +784,7 @@ tasks = { ("libs-configure", samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc --with-static-modules=!FORCED,!DEFAULT --with-shared-modules=!FORCED,!DEFAULT"), ("libs-make", "make -j"), ("libs-install", "make install"), - ("libs-check-clean-tree", "script/clean-source-tree.sh"), + ("libs-check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("libs-clean", "make clean"), ], @@ -802,7 +804,7 @@ tasks = { ("test-no-lmdb", "make test"), ("lcov-no-lmdb", LCOV_CMD), ("install-no-lmdb", "make install"), - ("check-clean-tree", "../../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("distcheck", "make distcheck"), ("clean", "make clean"), ], @@ -816,7 +818,7 @@ tasks = { ("install", "make install"), ("test", "make test"), ("lcov", LCOV_CMD), - ("check-clean-tree", "../../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("distcheck", "make distcheck"), ("clean", "make clean"), ], @@ -830,7 +832,7 @@ tasks = { ("install", "make install"), ("test", "make test"), ("lcov", LCOV_CMD), - ("check-clean-tree", "../../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("distcheck", "make distcheck"), ("clean", "make clean"), ], @@ -844,7 +846,7 @@ tasks = { ("install", "make install"), ("test", "make test"), ("lcov", LCOV_CMD), - ("check-clean-tree", "../../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("distcheck", "make distcheck"), ("clean", "make clean"), ], @@ -858,7 +860,7 @@ tasks = { ("install", "make install"), ("test", "make test"), ("lcov", LCOV_CMD), - ("check-clean-tree", "../../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("distcheck", "make distcheck"), ("clean", "make clean"), ], @@ -874,7 +876,7 @@ tasks = { ("test", "make test"), ("install", "make install"), ("checkout-yapp-generated", "git checkout lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm"), - ("check-clean-tree", "../script/clean-source-tree.sh"), + ("check-clean-tree", CLEAN_SOURCE_TREE_CMD), ("clean", "make clean"), ], }, |