Swiftdiff options
Diffstat (limited to 'QA')
| -rw-r--r-- | QA/Checker/SConscript | 8 | ||||
| -rw-r--r-- | QA/Checker/checker.cpp | 4 | ||||
| -rw-r--r-- | QA/UnitTest/SConscript | 15 |
3 files changed, 11 insertions, 16 deletions
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript index ed17be5..b0863da 100644 --- a/QA/Checker/SConscript +++ b/QA/Checker/SConscript @@ -4,12 +4,14 @@ if env["TEST"] : if env["SCONS_STAGE"] == "flags" : env["CHECKER_FLAGS"] = { + "CPPPATH" : ["#/3rdParty/HippoMocks"], "LIBS": ["Checker"], "LIBPATH": [Dir(".")], - "LINKFLAGS": ["/SUBSYSTEM:CONSOLE"] if env["PLATFORM"] == "win32" else [] + "LINKFLAGS": env["PLATFORM"] == "win32" and ["/SUBSYSTEM:CONSOLE"] or [] } if env["SCONS_STAGE"] == "build" : checker_env = env.Clone() - checker_env.MergeFlags(env["BOOST_FLAGS"]) - checker_env.MergeFlags(env["CPPUNIT_FLAGS"]) + checker_env.UseFlags(env["SWIFTEN_FLAGS"]) + checker_env.UseFlags(env["BOOST_FLAGS"]) + checker_env.UseFlags(env["CPPUNIT_FLAGS"]) checker_env.Library("Checker", ["checker.cpp", "IO.cpp"]) diff --git a/QA/Checker/checker.cpp b/QA/Checker/checker.cpp index 12237dc..1ec8892 100644 --- a/QA/Checker/checker.cpp +++ b/QA/Checker/checker.cpp @@ -20,4 +20,6 @@ int main(int argc, char* argv[]) { bool outputXML = false; + Swift::Log::setLogLevel(Swift::Log::error); + // Parse parameters std::vector<std::string> testsToRun; @@ -31,5 +33,5 @@ int main(int argc, char* argv[]) { } else if (param == "--debug") { - Swift::logging = true; + Swift::Log::setLogLevel(Swift::Log::debug); } else { 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) |