1 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 799929d..6cd55aa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2,96 +2,103 @@ import sys, os
 sys.path.append(Dir("BuildTools/SCons").abspath)
 import SCons.SConf
 
 ################################################################################
 # Build variables
 ################################################################################
 
 vars = Variables("config.py")
 vars.Add('ccflags', "Extra C(++) compiler flags")
 vars.Add('linkflags', "Extra linker flags")
 vars.Add(EnumVariable("test", "Compile and run tests", "none", ["none", "all", "unit", "system"]))
 vars.Add(BoolVariable("optimize", "Compile with optimizations turned on", "no"))
 vars.Add(BoolVariable("debug", "Compile with debug information", "yes" if os.name != "nt" else "no"))
 vars.Add(BoolVariable("warnings", "Compile with warnings turned on", 
 		"yes" if os.name != "nt" else "no"))
 if os.name != "nt" :
 	vars.Add(BoolVariable("coverage", "Compile with coverage information", "no"))
 if os.name == "posix" :
 	vars.Add(BoolVariable("valgrind", "Run tests with valgrind", "no"))
 if os.name == "mac" :
 	vars.Add(BoolVariable("universal", "Create universal binaries", "no"))
 if os.name == "nt" :
 	vars.Add(PathVariable("vcredist", "MSVC redistributable dir", "", PathVariable.PathAccept))
 if os.name == "nt" :
 	vars.Add(PackageVariable("bonjour", "Bonjour SDK location", "yes"))
 vars.Add(PackageVariable("openssl", "OpenSSL location", "yes"))
 vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
 
 ################################################################################
 # Set up default build & configure environment
 ################################################################################
 
 env = Environment(CPPPATH = "#", ENV = {'PATH' : os.environ['PATH']}, variables = vars)
 
 Help(vars.GenerateHelpText(env))
 
 env.Alias("dist", ["."])
 
 # Default custom tools
 env.Tool("Test", toolpath = ["#/BuildTools/SCons/Tools"])
 env.Tool("WriteVal", toolpath = ["#/BuildTools/SCons/Tools"])
 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" :
 		env.Append(CCFLAGS = ["GL"])
 		env.Append(LINKFLAGS = ["/INCREMENTAL:NO", "/LTCG"])
 
 if env["debug"] :
 	if env["PLATFORM"] == "win32" :
 		env.Append(CCFLAGS = ["/Zi", "/MDd"])
 		env.Append(LINKFLAGS = ["/DEBUG"])
 	else :
 		env.Append(CCFLAGS = "-g")
 elif env["PLATFORM"] == "win32" :
 	env.Append(CCFLAGS = ["/MD"])
 
 if env.get("universal", 0) :
 	assert(env["PLATFORM"] == "darwin")
 	env.Append(CCFLAGS = [
 			"-isysroot", "/Developer/SDKs/MacOSX10.4u.sdk", 
 			"-arch", "i386", 
 			"-arch", "ppc"])
 	env.Append(LINKFLAGS = [
 			"-mmacosx-version-min=10.4", 
 			"-Wl", "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk", 
 			"-arch", "i386", 
 			"-arch", "ppc"])
 
 if env["warnings"] :
 	if env["PLATFORM"] == "win32" :
 		env.Append(CCFLAGS = ["/Wall"])
 	else :
 		env.Append(CCFLAGS = ["-W", "-Wall"])
 		#env.Append(CCFLAGS = ["-W", "-Wall", "-Wredundant-decls", "-pedantic", "-Wno-long-long", "-Woverloaded-virtual", "-Wundef", "-Wfloat-equal", "-Wold-style-cast"])
 
 if env.get("coverage", 0) :
 	assert(env["PLATFORM"] != "win32")
 	env.Append(CCFLAGS = ["-fprofile-arcs", "-ftest-coverage"])
 	env.Append(LINKFLAGS = ["-fprofile-arcs", "-ftest-coverage"])
 
 if env["PLATFORM"] == "win32" :
 	env.Append(LIBS = ["user32", "dnsapi", "ws2_32", "wsock32"])
 	env.Append(CCFLAGS = ["/EHsc", "/nologo"])
 	env["LINKCOM"] = [env["LINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']
 	env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
 
@@ -272,87 +279,87 @@ if openssl_prefix :
 
 openssl_conf = Configure(openssl_env)
 if use_openssl and openssl_conf.CheckCHeader("openssl/ssl.h") :
 	env["HAVE_OPENSSL"] = 1
 	env["OPENSSL_FLAGS"] = openssl_flags
 	if env["PLATFORM"] == "win32" : 
 		env["OPENSSL_FLAGS"]["LIBS"] = ["libeay32MT", "ssleay32MT"]
 	else:
 		env["OPENSSL_FLAGS"]["LIBS"] = ["ssl", "crypto"]
 else :
 	env["OPENSSL_FLAGS"] = ""
 
 openssl_conf.Finish()
 
 # Bonjour
 if env["PLATFORM"] == "darwin" :
 	env["HAVE_BONJOUR"] = 1
 elif env.get("bonjour", False) :
 	bonjour_env = conf_env.Clone()
 	bonjour_conf = Configure(bonjour_env)
 	bonjour_flags = {}
 	if env.get("bonjour") != True :		
 		bonjour_prefix = env["bonjour"]
 		bonjour_flags["CPPPATH"] = [os.path.join(bonjour_prefix, "include")]
 		bonjour_flags["LIBPATH"] = [os.path.join(bonjour_prefix, "lib", "win32")]
 	bonjour_env.MergeFlags(bonjour_flags)
 	if bonjour_conf.CheckCHeader("dns_sd.h") and bonjour_conf.CheckLib("dnssd") :
 		env["HAVE_BONJOUR"] = 1
 		env["BONJOUR_FLAGS"] = bonjour_flags
 		env["BONJOUR_FLAGS"]["LIBS"] = ["dnssd"]
 	bonjour_conf.Finish()
 
 ################################################################################
 # Project files
 # FIXME: We need to explicitly list the order of libraries here, because of
 # the exported FLAGS. We should put FLAGS in separate SConscript files, and
 # read these in before anything else, such that we don't need to manually
 # list modules in order.
 ################################################################################
 
 # Third-party modules
 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"
 	])
 
 # Projects
 for dir in os.listdir(".") :
 	if dir in ["QA", "Swiften", "SwifTools"] :
 		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
 print "  Build Configuration"
 print "  -------------------"
 
 parsers = []
 if env.get("HAVE_LIBXML", 0):
 	parsers.append("LibXML")
 if env.get("HAVE_EXPAT", 0):
 	parsers.append("Expat")
 	if bundledExpat:
 		parsers.append("(Bundled)")
 print "  XML Parsers: " + ' '.join(parsers)
 
 print "  TLS Support: " + ("OpenSSL" if env.get("HAVE_OPENSSL",0) else "Disabled")
 print "  DNSSD Support: " + ("Bonjour" if env.get("HAVE_BONJOUR") else ("Avahi" if env.get("HAVE_AVAHI") else "Disabled"))
 print