sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

autobuild: Stop waf uninstall from removing test_tmpdir

Browse Source 
Most of the autobuild tasks run "make distcheck", which does a
recursive "waf configure make install uninstall".  "waf uninstall"
(via BuildContext.install() in Build.py) removes empty directories all
the way up the directory tree.  This means that it removes
test_tmpdir, if it is empty, and any empty directories above it.

While this is arguably a waf bug, the simplest solution is to make
test_tmpdir non-empty so it don't get removed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12703

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Mar 21 10:37:08 CET 2017 on sn-devel-144
This commit is contained in:
Martin Schwenke 2017-03-20 14:49:34 +11:00 committed by Stefan Metzmacher
parent 55546fe458
commit 05b5af4ae5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
script/autobuild.py
View File

@ -764,6 +764,11 @@ while True:
try:
run_cmd("rm -rf %s" % test_tmpdir, show=True)
os.makedirs(test_tmpdir)
# The waf uninstall code removes empty directories all the way
# up the tree. Creating a file in test_tmpdir stops it from
# being removed.
run_cmd("touch %s" % os.path.join(test_tmpdir,
".directory-is-not-empty"), show=True)
run_cmd("stat %s" % test_tmpdir, show=True)
run_cmd("stat %s" % testbase, show=True)
run_cmd("git clone --recursive --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)