diff options
author | Andrew Bartlett <abartlet@samba.org> | 2017-01-30 09:36:31 -0500 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2017-03-10 07:31:13 +0100 |
commit | 4455547204fd5d2d54944468c404f751279c495d (patch) | |
tree | f1ef5ae4c6e5804e6d3fce10931786580318c7f3 | |
parent | 7000fa01f8844450e020c84af85c7e1eb228b982 (diff) | |
download | samba-4455547204fd5d2d54944468c404f751279c495d.tar.gz |
autobuild: Add nopython environment to test --disable-python builds (but without tests)
This ensures we keep this option building as we extend our use of python.
The rule is that new features and changes to existing features that
require python are most welcome, they just need to be disabled for the
minimalistic targets we still ecourage Samba on, that typically just
want smbd
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-rw-r--r-- | .travis.yml | 1 | ||||
-rwxr-xr-x | script/autobuild.py | 18 |
2 files changed, 18 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 483ad501798..ce0e745548b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - TASK=samba-libs - TASK=samba-static - TASK=samba-o3 + - TASK=samba-nopython - TASK=ldb - TASK=tdb - TASK=talloc diff --git a/script/autobuild.py b/script/autobuild.py index 76b70fd3ee2..1e12d692e2e 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -32,6 +32,7 @@ builddirs = { "samba-static" : ".", "samba-test-only" : ".", "samba-systemkrb5" : ".", + "samba-nopython" : ".", "ldb" : "lib/ldb", "tdb" : "lib/tdb", "talloc" : "lib/talloc", @@ -43,7 +44,7 @@ builddirs = { "retry" : "." } -defaulttasks = [ "ctdb", "samba", "samba-xc", "samba-o3", "samba-ctdb", "samba-libs", "samba-static", "samba-systemkrb5", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ] +defaulttasks = [ "ctdb", "samba", "samba-xc", "samba-o3", "samba-ctdb", "samba-libs", "samba-static", "samba-systemkrb5", "samba-nopython", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ] if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1": defaulttasks.remove("samba-o3") @@ -178,6 +179,21 @@ tasks = { ("clean", "make clean", "text/plain") ], + # Test Samba without python still builds. When this test fails + # due to more use of Python, the expectations is that the newly + # failing part of the code should be disabled when + # --disable-python is set (rather than major work being done to + # support this environment). The target here is for vendors + # shipping a minimal smbd. + "samba-nopython" : [ + ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"), + ("configure", "./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"), + ("make", "make -j", "text/plain"), + ("install", "make install", "text/plain"), + ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), + ("clean", "make clean", "text/plain") + ], + "ldb" : [ |