Swiftdiff options
Diffstat (limited to 'QA/UnitTest/SConscript')
| -rw-r--r-- | QA/UnitTest/SConscript | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript index 3a19ea5..0cacc7c 100644 --- a/QA/UnitTest/SConscript +++ b/QA/UnitTest/SConscript @@ -7,7 +7,8 @@ if env["TEST"] : 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("INJECTED_UNITTEST_FLAGS","")) # So things that piggy-back our build system can piggy-back our test system too myenv.UseFlags(env.get("SLIMBER_FLAGS","")) myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS","")) @@ -16,12 +17,5 @@ if env["TEST"] : myenv.UseFlags(env.get("SWIFTEN_FLAGS","")) myenv.UseFlags(env.get("CPPUNIT_FLAGS","")) - myenv.UseFlags(env.get("LIBIDN_FLAGS", "")) - myenv.UseFlags(env.get("BOOST_FLAGS", "")) - myenv.UseFlags(env.get("SQLITE_FLAGS", "")) - myenv.UseFlags(env.get("LIBXML_FLAGS", "")) - myenv.UseFlags(env.get("EXPAT_FLAGS", "")) - myenv.UseFlags(env.get("ZLIB_FLAGS", "")) - myenv.UseFlags(env.get("OPENSSL_FLAGS", "")) - myenv.UseFlags(env["PLATFORM_FLAGS"]) + myenv.UseFlags(env.get("SWIFTEN_DEP_FLAGS", "")) if env.get("HAVE_LIBXML") : myenv.Append(CPPDEFINES = ["HAVE_LIBXML"]) @@ -33,6 +27,3 @@ if env["TEST"] : else : checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"]) - for i in ["HOME", "USERPROFILE", "APPDATA"]: - if os.environ.get(i, "") : - myenv["ENV"][i] = os.environ[i] myenv.Test(checker, is_checker = True) |