selftest: fix tap2subunit detection on system with tap2subunit but not correct subuni...

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sun Nov 21 16:21:54 CET 2010 on sn-devel-104

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 7a2dd44a61861a258ba827e5463a9b5bc59a17fd..1d1d517a4c7c9a8aeea7abff3ae686723cefd672 100755 (executable)
--- 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"])