X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af31dd975b1e230238630006d10452d25ca10a98..992d6e1e2c5208ec3fded3d92691425f6b484630:/build/buildbot/config/xp_vc.xml?ds=inline

diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
index 6b86e102e0..906bda0b99 100644
--- a/build/buildbot/config/xp_vc.xml
+++ b/build/buildbot/config/xp_vc.xml
@@ -14,11 +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/>
-            <run-tests/>
+            <compile-all tests="true"/>
         </steps>
     </build>
     <build>
@@ -26,11 +25,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"/>
-            <run-tests/>
+            <compile-all contrib="false" tests="true"/>
         </steps>
     </build>
     <build>
@@ -38,11 +36,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/>
-            <run-tests/>
+            <compile-all tests="true"/>
         </steps>
     </build>
     <build>
@@ -50,11 +47,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"/>
-            <run-tests/>
+            <compile-all contrib="false" tests="true"/>
         </steps>
     </build>
     <build>
@@ -62,11 +58,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/>
-            <run-tests/>
+            <compile-all tests="true"/>
         </steps>
     </build>
     <build>
@@ -74,11 +69,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"/>
-            <run-tests/>
+            <compile-all contrib="false" tests="true"/>
         </steps>
     </build>
     <build>
@@ -86,11 +80,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/>
-            <run-tests/>
+            <compile-all tests="true"/>
         </steps>
     </build>
     <build>
@@ -98,12 +91,10 @@
         <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"/>
-            <run-tests/>
+            <compile-all contrib="false" tests="true"/>
         </steps>
     </build>
-
 </bot>