Swiftdiff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | QA | 0 | ||||
| -rw-r--r-- | QA/Checker/SConscript | 10 | ||||
| -rw-r--r-- | QA/Checker/checker.cpp | 73 | ||||
| -rw-r--r-- | QA/UnitTest/SConscript | 26 | ||||
| -rw-r--r-- | QA/UnitTest/template/FooTest.cpp | 22 | ||||
| -rw-r--r-- | QA/valgrind.supp | 51 |
7 files changed, 3 insertions, 182 deletions
diff --git a/.gitmodules b/.gitmodules index a61dcea..2223e7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "Swiften"] path = Swiften url = swift@swift.im:git/swiften-module.git +[submodule "QA"] + path = QA + url = swift@swift.im:git/qa-module.git diff --git a/QA b/QA new file mode 160000 +Subproject 2eb285e3a51c2482fd51558289d58675a6fe5b7 diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript deleted file mode 100644 index 7516bb9..0000000 --- a/QA/Checker/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -Import("env") - -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 [] - } diff --git a/QA/Checker/checker.cpp b/QA/Checker/checker.cpp deleted file mode 100644 index b59cea6..0000000 --- a/QA/Checker/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; -} diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript deleted file mode 100644 index a1d5a60..0000000 --- a/QA/UnitTest/SConscript +++ /dev/null @@ -1,26 +0,0 @@ -import os - -Import("env") - -myenv = env.Clone() -myenv.MergeFlags(env["CHECKER_FLAGS"]) -myenv.MergeFlags(env["SLIMBER_FLAGS"]) -myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"]) -myenv.MergeFlags(env["SWIFTOOLS_FLAGS"]) -myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["CPPUNIT_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env.get("SQLITE_FLAGS", "")) -myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) -myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) -myenv.MergeFlags(env["ZLIB_FLAGS"]) -if env.get("HAVE_LIBXML") : - myenv.Append(CPPDEFINES = ["HAVE_LIBXML"]) -if env.get("HAVE_EXPAT") : - myenv.Append(CPPDEFINES = ["HAVE_EXPAT"]) -checker = myenv.Program("checker", env["UNITTEST_SOURCES"]) -for i in ["HOME", "USERPROFILE", "APPDATA"]: - if os.environ.get(i, "") : - myenv["ENV"][i] = os.environ[i] -myenv.Test(checker) diff --git a/QA/UnitTest/template/FooTest.cpp b/QA/UnitTest/template/FooTest.cpp deleted file mode 100644 index 9657360..0000000 --- a/QA/UnitTest/template/FooTest.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/extensions/TestFactoryRegistry.h> - -using namespace Swift; - -class FooTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(FooTest); - CPPUNIT_TEST(testBar); - CPPUNIT_TEST_SUITE_END(); - - public: - void setUp() { - } - - void tearDown() { - } - - void testBar() { - } -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(FooTest); diff --git a/QA/valgrind.supp b/QA/valgrind.supp deleted file mode 100644 index 5e2ee00..0000000 --- a/QA/valgrind.supp +++ /dev/null @@ -1,51 +0,0 @@ -{ - ZLib doesn't allocate its buffer. This is no bug according to the FAQ. - Memcheck:Cond - fun:longest_match - fun:deflate_slow - fun:deflate -} - -{ - Not sure why this happens. - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.1 - fun:_ZN5boost6thread12start_threadEv -} - -{ - <insert a suppression name here> - Memcheck:Param - socketcall.sendto(msg) - fun:sendto - fun:getaddrinfo -} - -{ - <insert a suppression name here> - Memcheck:Cond - fun:BN_bin2bn -} - -{ - <insert a suppression name here> - Memcheck:Cond - fun:BN_num_bits_word -} - -{ - <insert a suppression name here> - Memcheck:Value4 - fun:BN_mod_exp_mont_consttime - fun:BN_mod_exp_mont -} - -{ - <insert a suppression name here> - Memcheck:Value4 - fun:BN_num_bits_word - fun:BN_mod_exp_mont_consttime - fun:BN_mod_exp_mont -} |