summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-12-01 18:03:46 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-12-01 18:03:46 (GMT)
commit6e50bd41dc3f11815a40dfef500dc0d61ea5d737 (patch)
treee24c6cb209ba69952c1682549b6e25f04d088d6c /SConstruct
parented9a0f344ba78525254cacfb0f446a666b385a40 (diff)
downloadswift-contrib-6e50bd41dc3f11815a40dfef500dc0d61ea5d737.zip
swift-contrib-6e50bd41dc3f11815a40dfef500dc0d61ea5d737.tar.bz2
Override SConscript() with our own, test-aware implementation.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct11
1 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 799929d..6cd55aa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,6 +47,13 @@ if env["PLATFORM"] == "darwin" :
if env["PLATFORM"] == "win32" :
env.Tool("WindowsBundle", toolpath = ["#/BuildTools/SCons/Tools"])
+# Override SConscript to handle tests
+oldSConscript = SConscript
+def SConscript(*arguments, **keywords) :
+ if not keywords.get("test_only", False) or env["TEST"] :
+ return apply(oldSConscript, arguments, keywords)
+
+
# Default compiler flags
env["CCFLAGS"] = env.get("ccflags", [])
env["LINKFLAGS"] = env.get("linkflags", [])
@@ -317,7 +324,7 @@ SConscript(dirs = [
"3rdParty/SQLite"])
# Checker
-SConscript(dirs = ["QA/Checker"])
+SConscript(dirs = ["QA/Checker"], test_only = True)
# Libraries
SConscript(dirs = [
@@ -334,7 +341,7 @@ for dir in os.listdir(".") :
SConscript(sconscript)
# Unit test runner
-SConscript(dirs = ["QA/UnitTest"])
+SConscript(dirs = ["QA/UnitTest"], test_only = True)
################################################################################
# Print summary