Correct compilation breakage of r63832.

[wxWidgets.git] / build / buildbot / config / xp_vc.xml

diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
index afd5c2e280b788ccb6db8c523e5a82a232719a68..89e967f4352ce7db5ad0a82ba8eb7ef28109e840 100644 (file)
--- a/build/buildbot/config/xp_vc.xml
+++ b/build/buildbot/config/xp_vc.xml
@@ -17,7 +17,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout/>
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout/>

-            <compile-all/>
+            <compile-all tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -29,7 +29,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>

-            <compile-all contrib="false"/>
+            <compile-all contrib="false" tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -41,7 +41,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout/>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout/>

-            <compile-all/>
+            <compile-all tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -53,7 +53,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>

-            <compile-all contrib="false"/>
+            <compile-all contrib="false" tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -65,7 +65,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout/>
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout/>

-            <compile-all/>
+            <compile-all tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -77,7 +77,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>
         <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>

-            <compile-all contrib="false"/>
+            <compile-all contrib="false" tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -89,7 +89,7 @@
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout/>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout/>

-            <compile-all/>
+            <compile-all tests="true"/>

             <run-tests/>
         </steps>
     </build>
             <run-tests/>
         </steps>
     </build>


@@ -101,9 +101,34 @@
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>

-            <compile-all contrib="false"/>
+            <compile-all contrib="false" tests="true"/>

             <run-tests/>
         </steps>
     </build>
 
             <run-tests/>
         </steps>
     </build>
 

+    <build>
+        <name>XPSP2 VC9 wxMSW 2.9.x debug</name>
+        <builddir>XPSP2_VC9_wxMSW_29x_debug</builddir>
+        <scheduler>daily_0430</scheduler>
+        <sandbox>VC9</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
+        <steps>
+            <checkout branch="{$RELEASE_BRANCH}"/>
+            <compile-all tests="true"/>
+            <run-tests/>
+        </steps>
+    </build>
+
+    <build>
+        <name>XPSP2 VC6 wxMSW 2.9.x debug</name>
+        <builddir>XPSP2_VC6_wxMSW_29x_debug</builddir>
+        <scheduler>daily_0330</scheduler>
+        <sandbox>VC6</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
+        <steps>
+            <checkout branch="{$RELEASE_BRANCH}"/>
+            <compile-all tests="true"/>
+            <run-tests/>
+        </steps>
+    </build>

 </bot>
 </bot>