diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2020-09-11 13:36:22 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2020-10-01 01:18:39 +0000 |
| commit | 88663eb949a4cd097d3cdadd960251542ccb6064 (patch) | |
| tree | 608501f2bdb7dfdc0e76dfe0e18e065b99fab10c /script | |
| parent | 584f5106cdaec3b117f3874054e094b0f00bebb6 (diff) | |
| download | samba-88663eb949a4cd097d3cdadd960251542ccb6064.tar.gz | |
autobuild: Merge no-modules test with the library --disable-python build
This avoids another full compile cycle.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/autobuild.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 00ac1815334..47bc8289491 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -674,11 +674,6 @@ tasks = { ("allstatic-test", make_test(TESTS="samba3.smb2.create.*nt4_dc")), ("lcov", LCOV_CMD), - # retry without any required modules - ("none-distclean", "make distclean"), - ("none-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=!FORCED,!DEFAULT --with-shared-modules=!FORCED,!DEFAULT"), - ("none-make", "make -j"), - # retry with nonshared smbd and smbtorture ("nonshared-distclean", "make distclean"), ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"), @@ -708,8 +703,8 @@ tasks = { ("ldb-make", "cd lib/ldb && make"), ("ldb-install", "cd lib/ldb && make install"), - # retry against installed library packages - ("libs-configure", samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc"), + # retry against installed library packages, but no required modules + ("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"), |