diff --git a/hudson-sflphone-script.sh b/hudson-sflphone-script.sh
index b3e99a3cd0047446bd3732ec87f3b907b4c4eaed..6bbe3e5f71c517264d7142052bafe587d63f103b 100755
--- a/hudson-sflphone-script.sh
+++ b/hudson-sflphone-script.sh
@@ -27,7 +27,7 @@ popd
# Run the unit tests for the daemon
pushd sflphone-common/test
make check
-./test
+./test --xml
popd
diff --git a/sflphone-common/test/cppunitresults.xml b/sflphone-common/test/cppunitresults.xml
deleted file mode 100644
index 5a1eaaa07bad8243b6e9d7d01ff9cbe3d294a0da..0000000000000000000000000000000000000000
--- a/sflphone-common/test/cppunitresults.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding='ISO-8859-1' standalone='yes' ?>
-<TestRun>
- <FailedTests>
- <FailedTest id="9">
- <Name>HistoryTest::test_get_history_serialized</Name>
- <FailureType>Assertion</FailureType>
- <Location>
- <File>historytest.cpp</File>
- <Line>149</Line>
- </Location>
- <Message>assertion failed
-- Expression: Validator::isEqual (tmp, res ["747638685"])
-</Message>
- </FailedTest>
- <FailedTest id="10">
- <Name>HistoryTest::test_set_serialized_history</Name>
- <FailureType>Assertion</FailureType>
- <Location>
- <File>historytest.cpp</File>
- <Line>183</Line>
- </Location>
- <Message>assertion failed
-- Expression: Validator::isEqual (tmp, map_test ["747638685"])
-</Message>
- </FailedTest>
- </FailedTests>
- <SuccessfulTests>
- <Test id="1">
- <Name>AccountTest::TestAddRemove</Name>
- </Test>
- <Test id="2">
- <Name>AudioLayerTest::testAudioLayerConfig</Name>
- </Test>
- <Test id="3">
- <Name>AudioLayerTest::testPulseConnect</Name>
- </Test>
- <Test id="4">
- <Name>ConfigurationTest::testYamlEmitter</Name>
- </Test>
- <Test id="5">
- <Name>HistoryTest::test_create_history_path</Name>
- </Test>
- <Test id="6">
- <Name>HistoryTest::test_save_history_items_map</Name>
- </Test>
- <Test id="7">
- <Name>HistoryTest::test_load_history_from_file</Name>
- </Test>
- <Test id="8">
- <Name>HistoryTest::test_load_history_items_map</Name>
- </Test>
- <Test id="11">
- <Name>HistoryTest::test_set_serialized_history_with_limit</Name>
- </Test>
- <Test id="12">
- <Name>HistoryTest::test_save_history_to_file</Name>
- </Test>
- <Test id="13">
- <Name>HookManagerTest::testAddAction</Name>
- </Test>
- <Test id="14">
- <Name>HookManagerTest::testLargeUrl</Name>
- </Test>
- <Test id="15">
- <Name>NumberCleanerTest::test_format_1</Name>
- </Test>
- <Test id="16">
- <Name>NumberCleanerTest::test_format_2</Name>
- </Test>
- <Test id="17">
- <Name>NumberCleanerTest::test_format_3</Name>
- </Test>
- <Test id="18">
- <Name>NumberCleanerTest::test_format_4</Name>
- </Test>
- <Test id="19">
- <Name>NumberCleanerTest::test_format_5</Name>
- </Test>
- <Test id="20">
- <Name>NumberCleanerTest::test_format_6</Name>
- </Test>
- <Test id="21">
- <Name>NumberCleanerTest::test_format_10</Name>
- </Test>
- <Test id="22">
- <Name>PluginManagerTest::testLoadDynamicLibrary</Name>
- </Test>
- <Test id="23">
- <Name>PluginManagerTest::testUnloadDynamicLibrary</Name>
- </Test>
- <Test id="24">
- <Name>PluginManagerTest::testInstanciatePlugin</Name>
- </Test>
- <Test id="25">
- <Name>PluginManagerTest::testInitPlugin</Name>
- </Test>
- <Test id="26">
- <Name>PluginManagerTest::testRegisterPlugin</Name>
- </Test>
- <Test id="27">
- <Name>PluginManagerTest::testLoadPlugins</Name>
- </Test>
- <Test id="28">
- <Name>PluginManagerTest::testUnloadPlugins</Name>
- </Test>
- <Test id="29">
- <Name>RtpTest::testRtpInitClose</Name>
- </Test>
- <Test id="30">
- <Name>SdesNegotiatorTest::testTagPattern</Name>
- </Test>
- <Test id="31">
- <Name>SdesNegotiatorTest::testCryptoSuitePattern</Name>
- </Test>
- <Test id="32">
- <Name>SdesNegotiatorTest::testKeyParamsPattern</Name>
- </Test>
- <Test id="33">
- <Name>SdesNegotiatorTest::testKeyParamsPatternWithoutMKI</Name>
- </Test>
- <Test id="34">
- <Name>SdesNegotiatorTest::testNegotiation</Name>
- </Test>
- <Test id="35">
- <Name>SdesNegotiatorTest::testMostSimpleCase</Name>
- </Test>
- </SuccessfulTests>
- <Statistics>
- <Tests>35</Tests>
- <FailuresTotal>2</FailuresTotal>
- <Errors>0</Errors>
- <Failures>2</Failures>
- </Statistics>
-</TestRun>
diff --git a/sflphone-common/test/main.cpp b/sflphone-common/test/main.cpp
index 8ac51de4825930d2c97a630d329ecf876d92fcac..b6fbbb81f8c1d184eded8047c78af9ccf47632ad 100644
--- a/sflphone-common/test/main.cpp
+++ b/sflphone-common/test/main.cpp
@@ -45,6 +45,7 @@ int main (int argc, char* argv[])
Logger::setDebugMode (true);
int argvIndex = 1;
+ bool xmlOutput = false;
if (argc > 1) {
if (strcmp ("--help", argv[1]) == 0) {
@@ -55,6 +56,7 @@ int main (int argc, char* argv[])
int testSuiteCount = suite->getChildTestCount();
printf ("Usage: test [OPTIONS] [TEST_SUITE]\n");
printf ("\nOptions:\n");
+ printf (" --xml - Output results in an XML file, instead of standard output.\n");
printf (" --debug - Debug mode\n");
printf (" --help - Print help\n");
printf ("\nAvailable test suites:\n");
@@ -69,7 +71,13 @@ int main (int argc, char* argv[])
Logger::setDebugMode (true);
_info ("Debug mode activated");
- }
+
+ } else if (strcmp("--xml", argv[1]) == 0) {
+ argvIndex++;
+
+ xmlOutput = true;
+ _info ("Using XML output");
+ }
}
// Default test suite : all tests
@@ -97,13 +105,15 @@ int main (int argc, char* argv[])
CppUnit::TextTestRunner runner;
runner.addTest (suite);
- // Change the default outputter to a compiler error format outputter
- // runner.setOutputter (new CppUnit::CompilerOutputter (&runner.result(), std::cerr));
-
- /* Specify XML output */
- std::ofstream outfile("cppunitresults.xml");
- CppUnit::XmlOutputter* outputter = new CppUnit::XmlOutputter(&runner.result(), outfile);
- runner.setOutputter(outputter);
+ if (xmlOutput) {
+ /* Specify XML output */
+ std::ofstream outfile("cppunitresults.xml");
+ CppUnit::XmlOutputter* outputter = new CppUnit::XmlOutputter(&runner.result(), outfile);
+ runner.setOutputter(outputter);
+ } else {
+ // Change the default outputter to a compiler error format outputter
+ runner.setOutputter (new CppUnit::CompilerOutputter (&runner.result(), std::cerr));
+ }
// Run the tests.
bool wasSucessful = runner.run();