Swiftdiff options
Diffstat (limited to 'QA/Checker')
| -rw-r--r-- | QA/Checker/SConscript | 8 | ||||
| -rw-r--r-- | QA/Checker/checker.cpp | 4 |
2 files changed, 8 insertions, 4 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 { |