diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-03-20 14:49:34 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-03-21 10:37:08 +0100 |
| commit | 05b5af4ae5fbc9b59c857468512858f73e5dea1b (patch) | |
| tree | bdf7a8478ffd543eddd89d28bbd28c189852cd34 /script | |
| parent | 55546fe458a1925e55323411a35be104c071cabb (diff) | |
| download | samba-05b5af4ae5fbc9b59c857468512858f73e5dea1b.tar.gz | |
autobuild: Stop waf uninstall from removing test_tmpdir
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
Diffstat (limited to 'script')
| -rwxr-xr-x | script/autobuild.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 1e12d692e2e..f60ce09a3b6 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -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) |