diff options
| -rw-r--r-- | lib/tdb/wscript | 4 | ||||
| -rwxr-xr-x | script/autobuild.py | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/tdb/wscript b/lib/tdb/wscript index e28e43acac..01b4892fb0 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -185,6 +185,10 @@ def testonly(ctx): if not os.path.exists(link): os.symlink(os.path.abspath(os.path.join(env.cwd, 'test')), link) + # unset TDB_NO_FSYNC, since we want to test sync code. + if 'TDB_NO_FSYNC' in os.environ: + del os.environ['TDB_NO_FSYNC'] + for f in 'tdb1-run-3G-file', 'tdb1-run-bad-tdb-header', 'tdb1-run', 'tdb1-run-check', 'tdb1-run-corrupt', 'tdb1-run-die-during-transaction', 'tdb1-run-endian', 'tdb1-run-incompatible', 'tdb1-run-nested-transactions', 'tdb1-run-nested-traverse', 'tdb1-run-no-lock-during-traverse', 'tdb1-run-oldhash', 'tdb1-run-open-during-transaction', 'tdb1-run-readonly-check', 'tdb1-run-rwlock-check', 'tdb1-run-summary', 'tdb1-run-transaction-expand', 'tdb1-run-traverse-in-transaction', 'tdb1-run-wronghash-fail', 'tdb1-run-zero-append': cmd = "cd " + testdir + " && " + os.path.abspath(os.path.join(Utils.g_module.blddir, f)) + " > test-output 2>&1" print("..." + f) 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"), |