diff options
| author | Stefan Metzmacher <metze@samba.org> | 2021-08-20 09:21:13 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2021-11-30 15:53:34 +0000 |
| commit | 03cd1449f697dc7a9950fd4d333273ea72bcb174 (patch) | |
| tree | 876d7a43ad121b1e215916f3a3a83ae5dbcb43b8 /script | |
| parent | 38c5bad4a853b19fe9a51fb059e150b153c4632a (diff) | |
| download | samba-03cd1449f697dc7a9950fd4d333273ea72bcb174.tar.gz | |
script/autobuild.py: fix "nondevel" builds of 'samba-libs'
Commit 3e6af7109eb9d49328b426095580e4bfb2338ceb removed environment
variables like PKG_CONFIG_PATH from the configure run, so we no longer
tested a build against the shared libraries we build before.
We also assert that we no longer build private libraries
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14780
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 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index f521a2e7d2e..3f790216850 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -831,16 +831,29 @@ tasks = { ("ldb-make", "cd lib/ldb && make"), ("ldb-install", "cd lib/ldb && make install"), - ("nondevel-configure", "./configure ${PREFIX}"), + ("nondevel-configure", samba_libs_envvars + " ./configure ${PREFIX}"), ("nondevel-make", "make -j"), ("nondevel-check", "./bin/smbd -b | grep WITH_NTVFS_FILESERVER && exit 1; exit 0"), - ("nondevel-install", "make install"), + ("nondevel-no-libtalloc", "find ./bin | grep -v 'libtalloc-report' | grep 'libtalloc' && exit 1; exit 0"), + ("nondevel-no-libtdb", "find ./bin | grep -v 'libtdb-wrap' | grep 'libtdb' && exit 1; exit 0"), + ("nondevel-no-libtevent", "find ./bin | grep -v 'libtevent-util' | grep 'libtevent' && exit 1; exit 0"), + ("nondevel-no-libldb", "find ./bin | grep -v 'module' | grep -v 'libldbsamba' | grep 'libldb' && exit 1; exit 0"), + ("nondevel-install", "make -j install"), ("nondevel-dist", "make dist"), - # retry with all modules shared + ("prefix-no-private-libtalloc", "find ${PREFIX_DIR} | grep -v 'libtalloc-report' | grep 'private.*libtalloc' && exit 1; exit 0"), + ("prefix-no-private-libtdb", "find ${PREFIX_DIR} | grep -v 'libtdb-wrap' | grep 'private.*libtdb' && exit 1; exit 0"), + ("prefix-no-private-libtevent", "find ${PREFIX_DIR} | grep -v 'libtevent-util' | grep 'private.*libtevent' && exit 1; exit 0"), + ("prefix-no-private-libldb", "find ${PREFIX_DIR} | grep -v 'module' | grep -v 'libldbsamba' | grep 'private.*libldb' && exit 1; exit 0"), + + # retry with all modules shared ("allshared-distclean", "make distclean"), ("allshared-configure", samba_libs_configure_samba + " --with-shared-modules=ALL"), ("allshared-make", "make -j"), + ("allshared-no-libtalloc", "find ./bin | grep -v 'libtalloc-report' | grep 'libtalloc' && exit 1; exit 0"), + ("allshared-no-libtdb", "find ./bin | grep -v 'libtdb-wrap' | grep 'libtdb' && exit 1; exit 0"), + ("allshared-no-libtevent", "find ./bin | grep -v 'libtevent-util' | grep 'libtevent' && exit 1; exit 0"), + ("allshared-no-libldb", "find ./bin | grep -v 'module' | grep -v 'libldbsamba' | grep 'libldb' && exit 1; exit 0"), ], }, |