Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-10-31 13:38:05 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-01 11:19:59 (GMT) |
| commit | 632c6c8dd641e74c62e9561770af0a66711bc3da (patch) | |
| tree | bad7571fc8b7be8ef67ae139aec51a00100fc38d /QA/UnitTest | |
| parent | b353fac98e08d8f225781b95e55b80aa67171262 (diff) | |
| download | swift-632c6c8dd641e74c62e9561770af0a66711bc3da.zip swift-632c6c8dd641e74c62e9561770af0a66711bc3da.tar.bz2 | |
Moving tests around.
Diffstat (limited to 'QA/UnitTest')
| -rw-r--r-- | QA/UnitTest/SConscript | 10 | ||||
| -rw-r--r-- | QA/UnitTest/checker.cpp | 73 |
2 files changed, 0 insertions, 83 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript index f93cdc2..f4bb358 100644 --- a/QA/UnitTest/SConscript +++ b/QA/UnitTest/SConscript @@ -2,16 +2,6 @@ import os Import("env") -# The checker -checker_env = env.Clone() -checker_env.MergeFlags(env["CPPUNIT_FLAGS"]) -checker_env.Library("Checker", "checker.cpp") -env["CHECKER_FLAGS"] = { - "LIBS": ["Checker"], - "LIBPATH": [Dir(".")], - "LINKFLAGS": ["/SUBSYSTEM:CONSOLE"] if env["PLATFORM"] == "win32" else [] - } - if env["TEST"] : myenv = env.Clone() myenv.MergeFlags(env["CHECKER_FLAGS"]) diff --git a/QA/UnitTest/checker.cpp b/QA/UnitTest/checker.cpp deleted file mode 100644 index b59cea6..0000000 --- a/QA/UnitTest/checker.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include <string> -#include <cppunit/ui/text/TestRunner.h> -#include <cppunit/extensions/TestFactoryRegistry.h> -#include <cppunit/XmlOutputter.h> -#include <cppunit/TextTestResult.h> -#include <cppunit/BriefTestProgressListener.h> -#include <cppunit/TextTestProgressListener.h> -#include <cppunit/TextOutputter.h> - -int main(int argc, char* argv[]) { - bool verbose = false; - bool outputXML = false; - - // Parse parameters - std::vector<std::string> testsToRun; - for (int i = 1; i < argc; ++i) { - std::string param(argv[i]); - if (param == "--verbose") { - verbose = true; - } - else if (param == "--xml") { - outputXML = true; - } - else { - testsToRun.push_back(param); - } - } - if (testsToRun.empty()) { - testsToRun.push_back(""); - } - - // Set up the listeners - CppUnit::TestResult controller; - - CppUnit::TestResultCollector result; - controller.addListener(&result); - - CppUnit::TextTestProgressListener progressListener; - CppUnit::BriefTestProgressListener verboseListener; - if (!outputXML) { - if (verbose) { - controller.addListener(&verboseListener); - } - else { - controller.addListener(&progressListener); - } - } - - // Run the tests - CppUnit::TestRunner runner; - runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); - for (std::vector<std::string>::const_iterator i = testsToRun.begin(); i != testsToRun.end(); ++i) { - try { - runner.run(controller, *i); - } - catch (const std::exception& e) { - std::cerr << "Error: " << e.what() << std::endl; - return -1; - } - } - - // Output the results - if (outputXML) { - CppUnit::XmlOutputter outputter(&result, std::cerr); - outputter.write(); - } - else { - CppUnit::TextOutputter outputter(&result, std::cerr); - outputter.write(); - } - - return result.wasSuccessful() ? 0 : 1; -} |