diff options
Diffstat (limited to 'QA/Checker/checker.cpp')
-rw-r--r-- | QA/Checker/checker.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/QA/Checker/checker.cpp b/QA/Checker/checker.cpp index bcf0f5c..4d6a90e 100644 --- a/QA/Checker/checker.cpp +++ b/QA/Checker/checker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Isode Limited. + * Copyright (c) 2010-2019 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,7 +9,10 @@ #include <string> #include <sstream> +#include <boost/algorithm/string/predicate.hpp> + #include <gtest/gtest.h> +#include <QA/Checker/CppUnitTestResultPrinter.h> #include <cppunit/BriefTestProgressListener.h> #include <cppunit/TextOutputter.h> @@ -42,6 +45,9 @@ int main(int argc, char* argv[]) { else if (param == "--debug") { Swift::Log::setLogLevel(Swift::Log::debug); } + else if (boost::starts_with(param, "--")) { + continue; + } else { testsToRun.push_back(param); } @@ -126,10 +132,16 @@ int main(int argc, char* argv[]) { auto googleTestWasSuccessful = false; try { + if (!verbose) { + testing::UnitTest& unitTest = *testing::UnitTest::GetInstance(); + testing::TestEventListeners& listeners = unitTest.listeners(); + delete listeners.Release(listeners.default_result_printer()); + listeners.Append(new testing::CppUnitTestResultPrinter); + } googleTestWasSuccessful = RUN_ALL_TESTS() == 0 ? true : false; } catch (const ::testing::internal::GoogleTestFailureException& e) { googleTestWasSuccessful = false; - SWIFT_LOG(error) << "GoogleTestFailureException was thrown: " << e.what() << std::endl; + SWIFT_LOG(error) << "GoogleTestFailureException was thrown: " << e.what(); } auto cppUnitWasSuccessful = result.wasSuccessful() ? true : false; |