Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another attempt to run tests with verbose logging in STL trunk build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-07 21:44:52 +00:00
parent 16be58c140
commit 9820211f11
2 changed files with 7 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
build/buildbot/config/include/defs.xml
View File

@@ -333,6 +333,7 @@
--> -->
<xsl:template name="run-tests"> <xsl:template name="run-tests">
<xsl:param name="content"/> <xsl:param name="content"/>
<xsl:param name="options"/>
<xsl:param name="msw"><is-msw/></xsl:param> <xsl:param name="msw"><is-msw/></xsl:param>
<test> <test>
<defaults content="{$content}"> <defaults content="{$content}">
@@ -344,43 +345,10 @@
<command> <command>
<xsl:choose> <xsl:choose>
<xsl:when test="$msw = 'true'"> <xsl:when test="$msw = 'true'">
<run-tests-win/> <run-tests-win options="{$options}"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<run-tests-unix/> <run-tests-unix options="{$options}"/>
</xsl:otherwise>
</xsl:choose>
</command>
</copy-with-defaults>
</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:otherwise>
</xsl:choose> </xsl:choose>
</command> </command>
@@ -393,6 +361,7 @@
simple command so that these aren't necessary. 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; cd tests &amp;&amp;
(for /d %x in (..\lib\*_dll) do @PATH=%x;%PATH%) &amp;&amp; (for /d %x in (..\lib\*_dll) do @PATH=%x;%PATH%) &amp;&amp;
@@ -402,26 +371,10 @@ cd tests &amp;&amp;
</xsl:template> </xsl:template>
<xsl:template name="run-tests-unix"> <xsl:template name="run-tests-unix">
<xsl:param name="options"/>
<normalize-space> <normalize-space>
cd tests &amp;&amp; cd tests &amp;&amp;
./test &amp;&amp; ./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>
<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>
<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 if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
</normalize-space> </normalize-space>
</xsl:template> </xsl:template>

2
build/buildbot/config/ravnsgaard.xml
View File

@@ -28,7 +28,7 @@
<checkout/> <checkout/>
<configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/> <configure options="--with-gtk --disable-debug --enable-stl --enable-std_iostreams --enable-std_string --disable-compat28"/>
<compile-all/> <compile-all/>
<run-tests-with-timing/> <run-tests options="-t"/>
</steps> </steps>
</build> </build>