[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  0d85d2b selftest: fix tap2subunit detection on system with tap2subunit but not correct subunit libs
      from  d218472 s4:provision_rootdse_add.ldif - add all possible LDAP policy values but outcommented for the moment

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0d85d2b4bf9221213bd86987ff579b08e0049629
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Nov 20 12:22:57 2010 +0300

    selftest: fix tap2subunit detection on system with tap2subunit but not correct subunit libs
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sun Nov 21 16:21:54 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/selftest/tests.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 7a2dd44..1d1d517 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -149,7 +149,12 @@ sub.communicate("")
 if sub.returncode != 0:
     tap2subunit = "PYTHONPATH=%s/../lib/subunit/python:%s/../lib/testtools %s %s/../lib/subunit/filters/tap2subunit" % (samba4srcdir, samba4srcdir, python, samba4srcdir)
 else:
-    tap2subunit = "tap2subunit"
+    cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit 2> /dev/null | grep skip"
+    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
+    if sub.returncode == 0:
+        tap2subunit = "tap2subunit"
+    else:
+        tap2subunit = "PYTHONPATH=%s/../lib/subunit/python:%s/../lib/testtools %s %s/../lib/subunit/filters/tap2subunit" % (samba4srcdir, samba4srcdir, python, samba4srcdir)
 
 subprocess.call([smb4torture, "-V"])
 


-- 
Samba Shared Repository