revert 59680; implement proper fix for wxMSW test failure detection

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

diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index 8a68746b513c475e1c8031612ae646f41c7377ef..544b5366abefa1873d92c45e8d6c7742839316d9 100644 (file)
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -356,17 +356,10 @@
     </test>
 </xsl:template>
 
     </test>
 </xsl:template>
 

-<!--
-    We need to add something to the wxWidgets sources to run the tests with a
-    simple command so that these aren't necessary.
--->

 <xsl:template name="run-tests-win">
     <xsl:param name="options"/>
 <normalize-space>
 <xsl:template name="run-tests-win">
     <xsl:param name="options"/>
 <normalize-space>

-cd tests &amp;&amp;
-(for /d %x in (..\lib\*_dll) do @PATH=%x;%PATH%) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test.exe %x\test) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test_gui.exe %x\test_gui)
+cd tests &amp;&amp; runtests.bat

 </normalize-space>
 </xsl:template>
 
 </normalize-space>
 </xsl:template>
 

diff --git a/tests/runtests.bat b/tests/runtests.bat
new file mode 100644 (file)
index 0000000..d6c7471
--- /dev/null
+++ b/tests/runtests.bat
@@ -0,0 +1,28 @@
+@echo off
+
+REM Runs wxWidgets CppUnit tests
+REM This script is used to return the correct return value to the caller
+REM which is required by Buildbot to recognize failures.
+REM $Id$
+
+set failure=0
+
+for /d %%x in (*) do @(
+    if exist %%x\test.exe (
+        %%x\test.exe
+        if %errorlevel% GEQ 1 set failure=1
+    )
+    if exist %%x\test_gui.exe (
+        %%x\test_gui.exe
+        if %errorlevel% GEQ 1 set failure=1
+    )
+)
+
+REM exit with code 1 if any of the test failed
+if %failure% EQU 1 exit 1
+
+REM remove the failure env var:
+set failure=
+
+REM exit with code 0 (all tests passed successfully)
+exit 0

diff --git a/tests/test.cpp b/tests/test.cpp
index f0c34e5526e4907438617be7a27406bc8bfd294e..afc4ad2ab546e746bf25ff38f4fa4950dc6d2de9 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -255,7 +255,7 @@ int TestApp::OnRun()
     }
 
     if ( m_list )
     }
 
     if ( m_list )

-        return 0;
+        return EXIT_SUCCESS;

 
     runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout));
 
 
     runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout));
 


@@ -279,7 +279,7 @@ int TestApp::OnRun()
     if ( m_detail || m_timing )
         runner.eventManager().addListener(&detailListener);
 
     if ( m_detail || m_timing )
         runner.eventManager().addListener(&detailListener);
 

-    return runner.run("", false, true, !verbose) ? 0 : 1;
+    return runner.run("", false, true, !verbose) ? EXIT_SUCCESS : EXIT_FAILURE;

 }
 
 int TestApp::OnExit()
 }
 
 int TestApp::OnExit()