summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-10-31 13:22:07 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-01 11:19:59 (GMT)
commitb353fac98e08d8f225781b95e55b80aa67171262 (patch)
tree6c16fb1af8c98ecfefe48eae4cbcce6dd600d975 /QA/UnitTest
parent27751e9b1a176e1169e1aa1cfc16180c559e061f (diff)
downloadswift-b353fac98e08d8f225781b95e55b80aa67171262.zip
swift-b353fac98e08d8f225781b95e55b80aa67171262.tar.bz2
Added SCons test framework.
Diffstat (limited to 'QA/UnitTest')
-rw-r--r--QA/UnitTest/SConscript5
1 files changed, 2 insertions, 3 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 4911018..f93cdc2 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -12,7 +12,7 @@ env["CHECKER_FLAGS"] = {
"LINKFLAGS": ["/SUBSYSTEM:CONSOLE"] if env["PLATFORM"] == "win32" else []
}
-if "check" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
+if env["TEST"] :
myenv = env.Clone()
myenv.MergeFlags(env["CHECKER_FLAGS"])
myenv.MergeFlags(env["SLIMBER_FLAGS"])
@@ -33,5 +33,4 @@ 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, env.get("TEST_RUNNER", "") + checker[0].abspath)
- myenv.AlwaysBuild(check)
+ myenv.Test(checker)