]> git.saurik.com Git - wxWidgets.git/commitdiff
Change the return code of the test program so that aborting a test with an
authorMichael Wetherell <mike.wetherell@ntlworld.com>
Fri, 22 Oct 2010 22:15:07 +0000 (22:15 +0000)
committerMichael Wetherell <mike.wetherell@ntlworld.com>
Fri, 22 Oct 2010 22:15:07 +0000 (22:15 +0000)
exception doesn't count as a failure, to provide a way to skip tests that
can't be performed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

tests/test.cpp

index ca957f81d2caca4226541980e20d9f02b4644479..983bc4f3ce2eb2326046d95a315ef40c9417f377 100644 (file)
@@ -34,6 +34,7 @@
 #include <cppunit/Test.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestFailure.h>
+#include <cppunit/TestResultCollector.h>
 
 #ifdef __VISUALC__
     #pragma warning(default:4100)
@@ -617,7 +618,9 @@ int TestApp::OnRun()
     runner.eventManager().pushProtector(new wxUnitTestProtector);
 
     bool printProgress = !(verbose || m_detail || m_timing);
-    return runner.run("", false, true, printProgress) ? EXIT_SUCCESS : EXIT_FAILURE;
+    runner.run("", false, true, printProgress);
+
+    return runner.result().testFailures() == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 int TestApp::OnExit()