X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2e0a94b08b11d028e10f57bbec1fbc3bf76757f..337bbb7a06504cf5f55b77ce0a17956b76a5f186:/build/buildbot/config/include/defs.xml

diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index a3531c51d8..c275cdf033 100644
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -6,7 +6,7 @@
     Author:     Mike Wetherell
     RCS-ID:     $Id$
     Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
+    Licence:    wxWindows licence
 -->
 
 <bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -22,8 +22,22 @@
 <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>
 
+<!--
+    disable - comment out a section.
+
+    Usage: <disable>
+                e.g. <build> ... etc.
+           </disable>
+
+    XML comments can't contain a double hyphen which tends to be used in
+    configure commands, so <disable> can be used instead. 
+-->
+<xsl:template name="disable"/>
+
 <!--
     checkout - build step for source checkout.
 
@@ -333,6 +347,8 @@
 -->
 <xsl:template name="run-tests">
     <xsl:param name="content"/>
+    <xsl:param name="options" select="'-t'"/>
+    <xsl:param name="guioptions" select="$options"/>
     <xsl:param name="msw"><is-msw/></xsl:param>
     <test>
         <defaults content="{$content}">
@@ -344,10 +360,10 @@
             <command>
                 <xsl:choose>
                     <xsl:when test="$msw = 'true'">
-                        <run-tests-win/>
+                        <run-tests-win options="{$options}" guioptions="{$guioptions}"/>
                     </xsl:when>
                     <xsl:otherwise>
-                        <run-tests-unix/>
+                        <run-tests-unix options="{$options}" guioptions="{$guioptions}"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </command>
@@ -355,75 +371,58 @@
     </test>
 </xsl:template>
 
-<!--
-    run-tests-with-timing - build step to run the test suites with extra timing
-    option.
-
-    Usage: as <test>
-
-    Typically just:
-        <run-tests-with-timing/>
--->
-<xsl:template name="run-tests-with-timing">
-    <xsl:param name="content"/>
-    <xsl:param name="msw"><is-msw/></xsl:param>
-    <test>
-        <defaults content="{$content}">
-            <description>running tests with timing</description>
-            <descriptionDone>run tests with timing</descriptionDone>
-            <warnOnFailure/>
-        </defaults>
-        <copy-with-defaults content="{$content}">
-            <command>
-                <xsl:choose>
-                    <xsl:when test="$msw = 'true'">
-                        <run-tests-with-timing-win/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <run-tests-with-timing-unix/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </command>
-        </copy-with-defaults>
-    </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"/>
+    <xsl:param name="guioptions"/>
 <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>
-cd tests &amp;&amp;
-./test &amp;&amp;
-if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
-</normalize-space>
-</xsl:template>
+    <xsl:param name="options"/>
+    <xsl:param name="guioptions"/>
+ERR=0
+cd tests || exit 0
+ulimit -c unlimited
 
-<xsl:template name="run-tests-with-timing-win">
-<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 -t) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test_gui.exe %x\test_gui -t)
-</normalize-space>
-</xsl:template>
+try()
+{
+    rm -f core
+    echo Running: "$@"
+    "$@" || ERR=$?
 
-<xsl:template name="run-tests-with-timing-unix">
-<normalize-space>
-cd tests &amp;&amp;
-./test -t &amp;&amp;
-if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
-</normalize-space>
+    if [ -f core -a -x "`which gdb`" ]; then
+        echo Crashed, attempting to display backtrace:
+        gdb -batch -c core -ex 'set pagination off' -ex bt "$1"
+    fi
+
+    echo
+}
+
+try ./test <xsl:value-of select="normalize-space($options)"/>
+
+test -x test_gui || exit $ERR
+
+if [ -z "$DISPLAY" ]; then
+    echo '$DISPLAY is not set, skipping GUI tests.'
+    exit $ERR
+fi
+
+echo 'Checking window manager:'
+WINDOW_MANAGER=$(xprop -root 32x '\n$0\n' _NET_SUPPORTING_WM_CHECK | grep ^0x)
+
+if [ -z "$WINDOW_MANAGER" ]; then
+    echo 'Window manager not present, skipping GUI tests.'
+    exit $ERR
+fi
+
+xprop -id $WINDOW_MANAGER 8s _NET_WM_NAME
+echo
+
+try ./test_gui <xsl:value-of select="normalize-space($guioptions)"/>
+
+exit $ERR
 </xsl:template>
 
 <!--