[SCM] Samba Shared Repository - branch master updated

Rusty Russell rusty at samba.org
Fri Mar 9 23:08:02 MST 2012

The branch, master has been updated
       via  583ffea lib/tdb: fix tests for standalone out-of-tree.
      from  7320a5c samba.tests.samba_tool.base: Avoid unnecessary call to testtools.matchers.Contains.


- Log -----------------------------------------------------------------
commit 583ffeae404cc632eebc43fed054391a59dffee2
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Sat Mar 10 14:08:48 2012 +1030

    lib/tdb: fix tests for standalone out-of-tree.
    Commit 4d58d0fa8f936e7efdc02e31c053d42a47b3e62a didn't work for lib/tdb
    outside the build tree: symlink was pointing to wrong place.
    Copy simplification from lib/tdb2, and fix the build farm.
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-Date: Sat Mar 10 07:07:45 CET 2012 on sn-devel-104


Summary of changes:
 lib/tdb/wscript |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Changeset truncated at 500 lines:

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 9eeb3c8..871c5c4 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -183,7 +183,8 @@ def testonly(ctx):
         # Symlink back to source dir so it can find tests in test/
         link = os.path.join(testdir, 'test')
         if not os.path.exists(link):
-            os.symlink(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir, 'lib', 'tdb', 'test'))), link)
+            os.symlink(os.path.abspath(os.path.join(env.cwd, 'test')), link)
         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)

Samba Shared Repository

More information about the samba-cvs mailing list