Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-04-19 17:40:32 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-19 17:40:32 (GMT) |
| commit | f5946a1273b363f46ae0753eccdf6bd96a72e997 (patch) | |
| tree | 870f404231c77341a8a2bc819d16c4754698dc67 | |
| parent | 807de848578269f5fd868c78d17681959992e362 (diff) | |
| download | swift-f5946a1273b363f46ae0753eccdf6bd96a72e997.zip swift-f5946a1273b363f46ae0753eccdf6bd96a72e997.tar.bz2 | |
Avoid 'test' phase when parsing SConscripts.
Change-Id: I504fa7d33b8cb6572f05ba8478d277ddc7705483
| -rw-r--r-- | BuildTools/SCons/SConstruct | 6 | ||||
| -rw-r--r-- | QA/UnitTest/SConscript | 5 |
2 files changed, 7 insertions, 4 deletions
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 |