From 4aa453ca538e77dd93ae13b42671ce3d84e4cc91 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 3 Nov 2010 15:39:03 +0100 Subject: [PATCH] s4:selftest: don't loose the exit code with the usage of filter-subunit! metze --- source4/selftest/tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 15a8ab38b80d..f0ce530e37b3 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -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): -- 2.34.1