From d5069a38c0857bf5a3961e7399b9acd5a3a07490 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Fri, 13 Oct 2006 14:12:10 +0000
Subject: [PATCH] Really fix termination status for boost unit tests
---
satscons/BoostUnitTests.py | 7 ++++---
satscons/SatSCons.py | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/satscons/BoostUnitTests.py b/satscons/BoostUnitTests.py
index 3579a8e4..7d250ad3 100644
--- 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 12eb6cfa..2d415983 100644
--- 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,
--
GitLab