diff --git a/satscons/BoostUnitTests.py b/satscons/BoostUnitTests.py index 3579a8e4f2d538fe28a1968900de2b5c9ecd171a..7d250ad3ac94c994e5901afcdaeb1d5afea9a792 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 12eb6cfa9632e08e1854bda892ab09d4f99e106e..2d415983e4582fb0241dec7676c3ec1303052e8a 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,