1 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 799929d..6cd55aa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -44,12 +44,19 @@ env.Tool("BuildVersion", toolpath = ["#/BuildTools/SCons/Tools"])
 if env["PLATFORM"] == "darwin" :
 	env.Tool("Nib", toolpath = ["#/BuildTools/SCons/Tools"])
 	env.Tool("AppBundle", toolpath = ["#/BuildTools/SCons/Tools"])
 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", [])
 if env["optimize"] :
 	env.Append(CCFLAGS = "-O2")
 	if env["PLATFORM"] == "win32" :
@@ -314,13 +321,13 @@ SConscript(dirs = [
 		"3rdParty/CppUnit",
 		"3rdParty/Boost",
 		"3rdParty/LibIDN",
 		"3rdParty/SQLite"])
 
 # Checker
-SConscript(dirs = ["QA/Checker"])
+SConscript(dirs = ["QA/Checker"], test_only = True)
 
 # Libraries
 SConscript(dirs = [
 		"Swiften",
 		"SwifTools"
 	])
@@ -331,13 +338,13 @@ for dir in os.listdir(".") :
 		continue 
 	sconscript = os.path.join(dir, "SConscript")
 	if os.path.isfile(sconscript) :
 		SConscript(sconscript)
 
 # Unit test runner
-SConscript(dirs = ["QA/UnitTest"])
+SConscript(dirs = ["QA/UnitTest"], test_only = True)
 
 ################################################################################
 # Print summary
 ################################################################################
 
 print