Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-12 17:59:10 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-12 17:59:10 (GMT) |
| commit | 283a6801fd11aeaf38b2298399c2bf622f743cf4 (patch) | |
| tree | a63e3401309793844c29b08512d7a9dc12636fb3 /QA/UnitTest | |
| parent | 2a28c1be20477ddf25a233ee34c991951295058b (diff) | |
| download | swift-283a6801fd11aeaf38b2298399c2bf622f743cf4.zip swift-283a6801fd11aeaf38b2298399c2bf622f743cf4.tar.bz2 | |
Added Slimber & valgrind testing to SCons.
Diffstat (limited to 'QA/UnitTest')
| -rw-r--r-- | QA/UnitTest/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript index 6382d56..505b633 100644 --- a/QA/UnitTest/SConscript +++ b/QA/UnitTest/SConscript @@ -4,6 +4,7 @@ Import("env") if "check" in COMMAND_LINE_TARGETS or env.GetOption("clean") : myenv = env.Clone() + myenv.MergeFlags(env["SLIMBER_FLAGS"]) myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"]) myenv.MergeFlags(env["SWIFTEN_FLAGS"]) myenv.MergeFlags(env["CPPUNIT_FLAGS"]) @@ -16,5 +17,5 @@ if "check" in COMMAND_LINE_TARGETS or env.GetOption("clean") : for i in ["HOME", "USERPROFILE", "APPDATA"]: if os.environ.get(i, "") : myenv["ENV"][i] = os.environ[i] - check = myenv.Alias("check", checker, checker[0].abspath) + check = myenv.Alias("check", checker, env.get("TEST_RUNNER", "") + checker[0].abspath) myenv.AlwaysBuild(check) |