From f5946a1273b363f46ae0753eccdf6bd96a72e997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 19 Apr 2013 19:40:32 +0200
Subject: Avoid 'test' phase when parsing SConscripts.

Change-Id: I504fa7d33b8cb6572f05ba8478d277ddc7705483

diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 1de598f..d5faaf4 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -578,9 +578,13 @@ for dir in os.listdir(Dir("#").abspath) :
 	if os.path.isfile(sconscript) :
 		modules.append(dir)
 
+# QA comes last
+modules.remove("QA")
+modules.append("QA")
+
 # Flags
 env["PROJECTS"] = [m for m in modules if m not in ["Documentation", "QA", "SwifTools"] and not m.startswith("3rdParty")]
-for stage in ["flags", "build", "test"] :
+for stage in ["flags", "build"] :
 	env["SCONS_STAGE"] = stage
 	SConscript(dirs = map(lambda x : root + "/" + x, modules))
 
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 11e6fbb..53c38f5 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -6,7 +6,7 @@ if env["TEST"] :
 	if env["SCONS_STAGE"] == "flags" :
 		env["UNITTEST_SOURCES"] = []
 		env["UNITTEST_OBJECTS"] = []
-	if env["SCONS_STAGE"] == "test" :
+	if env["SCONS_STAGE"] == "build" :
 		myenv = env.Clone()
 		myenv.UseFlags(env.get("CHECKER_FLAGS",""))
 		myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
@@ -25,5 +25,4 @@ if env["TEST"] :
 			myenv.Program("checker", lib)
 		else :
 			checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"])
-			myenv.Test(checker, is_checker = True)
-
+			myenv.Test(checker, is_checker = True)
\ No newline at end of file
-- 
cgit v0.10.2-6-g49f6