From f7f6992c1e6ee8ac4a55c2fddf169ac695362036 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 22 Jun 2012 09:44:36 +0930 Subject: autobuild: always set TDB_NO_FSYNC. Then we unset it inside the tdb test target itself. This means that new code can't accidently forget it, and we can set it in the 'buildnice' script on sn-devel, for example. Signed-off-by: Rusty Russell --- script/autobuild.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index da3f646181..92fa41393c 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -13,6 +13,9 @@ from distutils.sysconfig import get_python_lib samba_master = os.getenv('SAMBA_MASTER', 'git://git.samba.org/samba.git') samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 'git+ssh://git.samba.org/data/git/samba.git') +# This speeds up testing remarkably. +os.environ['TDB_NO_FSYNC'] = '1' + cleanup_list = [] builddirs = { @@ -45,7 +48,7 @@ tasks = { ("make bin/smbtorture4", "make bin/smbtorture4", "text/plain"), ("make everything", "make -j 4 everything", "text/plain"), ("install", "make install", "text/plain"), - ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain"), + ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"), ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], @@ -61,7 +64,7 @@ tasks = { # We have 'test' before 'install' because, 'test' should work without 'install' "samba" : [ ("configure", "./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"), ("make", "make -j", "text/plain"), - ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain"), + ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"), ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], @@ -111,12 +114,11 @@ tasks = { ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make", "text/plain"), ("install", "make install", "text/plain"), - ("test", "TDB_NO_FSYNC=1 make test", "text/plain"), + ("test", "make test", "text/plain"), ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"), ("distcheck", "make distcheck", "text/plain"), ("clean", "make clean", "text/plain") ], - # We don't use TDB_NO_FSYNC=1 here, because we want to test the transaction code "tdb" : [ ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"), ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), -- cgit