s4:selftest: don't loose the exit code with the usage of filter-subunit!
authorStefan Metzmacher <metze@samba.org>
Wed, 3 Nov 2010 14:39:03 +0000 (15:39 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 3 Nov 2010 14:47:39 +0000 (15:47 +0100)
metze

source4/selftest/tests.py

index 15a8ab38b80dd289ebaf868f7114c500c72eabb8..f0ce530e37b3942ace62ada36ff8e9f1781301fe 100755 (executable)
@@ -47,6 +47,8 @@ def valgrindify(cmdline):
         return cmdline
     return valgrind + " " + cmdline
 
+def filtered_cmdline(name, cmdline):
+    return "(rm -f _err; %s 2>&1 || touch _err) | ../selftest/filter-subunit --prefix=\"%s.\"; test -f _err && exit 1;echo FINE; exit 0" % (cmdline, name)
 
 def plantestsuite(name, env, cmdline):
     """Plan a test suite.
@@ -60,8 +62,7 @@ def plantestsuite(name, env, cmdline):
     print env
     if isinstance(cmdline, list):
         cmdline = " ".join(cmdline)
-    print "%s 2>&1 | ../selftest/filter-subunit --prefix=\"%s.\"" % (cmdline, name)
-
+    print "%s" % (filtered_cmdline(name, cmdline))
 
 def plantestsuite_loadlist(name, env, cmdline):
     print "-- TEST-LOADLIST --"
@@ -73,7 +74,7 @@ def plantestsuite_loadlist(name, env, cmdline):
     print env
     if isinstance(cmdline, list):
         cmdline = " ".join(cmdline)
-    print "%s $LOADLIST 2>&1 | ../selftest/filter-subunit --prefix=\"%s.\"" % (cmdline, fullname)
+    print "%s" % (filtered_cmdline(fullname, cmdline))
 
 
 def plantestsuite_idlist(name, env, cmdline):