Really fix termination status for boost unit tests

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@138 270642c3-0616-0410-b53a-bc976706d245

diff --git a/satscons/BoostUnitTests.py b/satscons/BoostUnitTests.py
index 3579a8e..7d250ad 100644 (file)
--- a/satscons/BoostUnitTests.py
+++ b/satscons/BoostUnitTests.py
@@ -17,13 +17,14 @@ def BoostUnitTests(env, target, source, test_source=None, LIBS = [], DEPENDS = [
     if source:
         sources = sources + env.Object(source)
     sources = sources + test_source
-    binName = os.path.join(path,'.' + os.path.splitext(name)[0]+'.bin')
+    binName = os.path.join(path,'.' + name +'.bin')
     testRunner = testEnv.Program(binName, sources)
     stamp = os.path.join(path,'.' + os.path.splitext(name)[0]+'.stamp')
     if DEPENDS:
         env.Depends(testRunner, DEPENDS)
-    return env.Command([ target, stamp ], testRunner,
-                       [ '( $SOURCE $BOOSTTESTARGS 2>&1 && touch ${TARGETS[1]} ) | tee ${TARGETS[0]}; exit $$PIPESTATUS[0]' ])
+    return env.Command([ stamp ], testRunner,
+                       [ '$SOURCE $BOOSTTESTARGS',
+                         'touch $TARGET' ])
 
 def dispatcher(*arg,**kw):
     return BoostUnitTests(*arg,**kw)

diff --git a/satscons/SatSCons.py b/satscons/SatSCons.py
index 12eb6cf..2d41598 100644 (file)
--- a/satscons/SatSCons.py
+++ b/satscons/SatSCons.py
@@ -126,7 +126,7 @@ def Objects(env, sources, testSources = None, LIBS = []):
 
     if testSources:
         test = env.BoostUnitTests(
-            target = 'test.log',
+            target = 'test',
             source = sources,
             test_source = testSources,
             LIBS = LIBS,