Correct compilation breakage of r63832.

[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 be0f7067f3f2007a3e0a59618330a5fa30bf1380..39605c89626afc609a33896ce1ef2e53ebc40f2f 100644 (file)
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -22,6 +22,9 @@
 <xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
 <xsl:template name="STABLE_BRANCH">branches/WX_2_8_BRANCH</xsl:template>
 <xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>
 <xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
 <xsl:template name="STABLE_BRANCH">branches/WX_2_8_BRANCH</xsl:template>
 <xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>

+<xsl:template name="RELEASE_BRANCH">branches/WX_2_9_0_BRANCH</xsl:template>
+<xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>
+<xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>

 
 <!--
     checkout - build step for source checkout.
 
 <!--
     checkout - build step for source checkout.


@@ -332,6 +335,7 @@
 -->
 <xsl:template name="run-tests">
     <xsl:param name="content"/>
 -->
 <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}">
     <xsl:param name="msw"><is-msw/></xsl:param>
     <test>
         <defaults content="{$content}">


@@ -343,10 +347,10 @@
             <command>
                 <xsl:choose>
                     <xsl:when test="$msw = 'true'">
             <command>
                 <xsl:choose>
                     <xsl:when test="$msw = 'true'">

-                        <run-tests-win/>
+                        <run-tests-win options="{$options}"/>

                     </xsl:when>
                     <xsl:otherwise>
                     </xsl:when>
                     <xsl:otherwise>

-                        <run-tests-unix/>
+                        <run-tests-unix options="{$options}"/>

                     </xsl:otherwise>
                 </xsl:choose>
             </command>
                     </xsl:otherwise>
                 </xsl:choose>
             </command>


@@ -354,24 +358,19 @@
     </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:template name="run-tests-win">

+    <xsl:param name="options"/>

 <normalize-space>
 <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">
 </normalize-space>
 </xsl:template>
 
 <xsl:template name="run-tests-unix">

+    <xsl:param name="options"/>

 <normalize-space>
 cd tests &amp;&amp;
 <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>
 
 </normalize-space>
 </xsl:template>