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 6b86e102e0271b1f0bd2ddc8f41407102af070fc..89e967f4352ce7db5ad0a82ba8eb7ef28109e840 100644 (file)
--- a/build/buildbot/config/xp_vc.xml
+++ b/build/buildbot/config/xp_vc.xml
@@ -14,10 +14,10 @@
         <builddir>XPSP2_VC9_wxMSW_trunk_release</builddir>
         <scheduler>trunk_quick</scheduler>
         <sandbox>VC9</sandbox>
-        <make>nmake -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>
+        <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>
@@ -26,10 +26,10 @@
         <builddir>XPSP2_VC9_wxMSW_stable_release</builddir>
         <scheduler>stable_quick</scheduler>
         <sandbox>VC9</sandbox>
-        <make>nmake -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>
+        <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>
@@ -38,10 +38,10 @@
         <builddir>XPSP2_VC9_wxMSW_trunk_debug</builddir>
         <scheduler>daily_0400</scheduler>
         <sandbox>VC9</sandbox>
-        <make>nmake -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>
+        <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>
@@ -50,10 +50,10 @@
         <builddir>XPSP2_VC9_wxMSW_stable_debug</builddir>
         <scheduler>daily_0500</scheduler>
         <sandbox>VC9</sandbox>
-        <make>nmake -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>
+        <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>
@@ -62,10 +62,10 @@
         <builddir>XPSP2_VC6_wxMSW_trunk_release</builddir>
         <scheduler>trunk_quick</scheduler>
         <sandbox>VC6</sandbox>
-        <make>nmake -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>
+        <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>
@@ -74,10 +74,10 @@
         <builddir>XPSP2_VC6_wxMSW_stable_release</builddir>
         <scheduler>stable_quick</scheduler>
         <sandbox>VC6</sandbox>
-        <make>nmake -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>
+        <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>
@@ -86,10 +86,10 @@
         <builddir>XPSP2_VC6_wxMSW_trunk_debug</builddir>
         <scheduler>daily_0600</scheduler>
         <sandbox>VC6</sandbox>
-        <make>nmake -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>
+        <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>
@@ -98,12 +98,37 @@
         <builddir>XPSP2_VC6_wxMSW_stable_debug</builddir>
         <scheduler>daily_0700</scheduler>
         <sandbox>VC6</sandbox>
-        <make>nmake -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>
+        <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>
 
+    <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>