set correct EOL style for files added in r58024

[wxWidgets.git] / build / buildbot / config / include / defs.xml

diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index 94c0d7909d9e0193c2af361c8263a731be4e4866..544b5366abefa1873d92c45e8d6c7742839316d9 100644 (file)
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -333,6 +333,7 @@
 -->
 <xsl:template name="run-tests">
     <xsl:param name="content"/>
+    <xsl:param name="options"/>
     <xsl:param name="msw"><is-msw/></xsl:param>
     <test>
         <defaults content="{$content}">
@@ -344,10 +345,10 @@
             <command>
                 <xsl:choose>
                     <xsl:when test="$msw = 'true'">
-                        <run-tests-win/>
+                        <run-tests-win options="{$options}"/>
                     </xsl:when>
                     <xsl:otherwise>
-                        <run-tests-unix/>
+                        <run-tests-unix options="{$options}"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </command>
@@ -355,24 +356,19 @@
     </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>
-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>
 
 <xsl:template name="run-tests-unix">
+    <xsl:param name="options"/>
 <normalize-space>
 cd tests &amp;&amp;
-./test &amp;&amp;
-if [ -x test_gui ]; then ./test_gui; fi
+./test <xsl:value-of select="normalize-space($options)"/> &amp;&amp;
+if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
 </normalize-space>
 </xsl:template>