]> git.saurik.com Git - wxWidgets.git/commitdiff
Update buildbot config.
authorMichael Wetherell <mike.wetherell@ntlworld.com>
Wed, 14 Apr 2010 07:21:44 +0000 (07:21 +0000)
committerMichael Wetherell <mike.wetherell@ntlworld.com>
Wed, 14 Apr 2010 07:21:44 +0000 (07:21 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/buildbot/config/StellarWerx64.xml
build/buildbot/config/TBITCWXBUILDBOT.xml
build/buildbot/config/brandt32.xml
build/buildbot/config/brandt64.xml [deleted file]
build/buildbot/config/run-tests.sh [deleted file]

index 7472b9c6eac68c33bd96af72b7a950d850ee2ba3..d1a218b344ca50ef38bbffcff533dffd23fc4d41 100644 (file)
@@ -15,7 +15,7 @@
     <scheduler>stable_quick</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
-        <configure/>
+        <configure options="--enable-compat26"/>
         <compile-all utils="false"/>
         <run-tests/>
     </steps>
index 03908e130a4d021cac99e46966df80403f49cf39..756c26a99a96018ef7b4e20610e3604f34e9cebd 100644 (file)
@@ -12,7 +12,7 @@
 <build>
     <name>MinGW x86 trunk</name>
     <builddir>tbitcwxbuildbot_mingw_trunk</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>trunk_quick</scheduler>
     <steps>
         <checkout/>
         <configure options="--host=i586-mingw32msvc
@@ -24,7 +24,7 @@
 <build>
     <name>MinGW x86 stable</name>
     <builddir>tbitcwxbuildbot_mingw_stable</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
         <configure options="--host=i586-mingw32msvc
index 6822ef498929c44f442e889340a315ac17c891c6..c837f3007542df64ceaa2d1be0b1d5b8d6b555b3 100644 (file)
@@ -15,7 +15,7 @@
     <scheduler>trunk_quick</scheduler>
     <steps>
         <checkout/>
-        <configure/>
+        <configure options="--enable-compat28"/>
         <compile-all/>
         <run-tests/>
     </steps>
@@ -48,7 +48,7 @@
 <build>
     <name>Linux x86 wxDFB trunk</name>
     <builddir>brandt32_dfb_trunk</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout/>
         <configure options="--with-directfb"/>
@@ -60,7 +60,7 @@
 <build>
     <name>Linux x86 wxDFB stable</name>
     <builddir>brandt32_dfb_stable</builddir>
-    <!--scheduler>daily_0600</scheduler-->
+    <scheduler>daily_0600</scheduler>
     <steps>
         <checkout branch="{$STABLE_BRANCH}"/>
         <configure options="--with-directfb"/>
diff --git a/build/buildbot/config/brandt64.xml b/build/buildbot/config/brandt64.xml
deleted file mode 100644 (file)
index 4be54c2..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       brandt64.xml
-    RCS-ID:     $Id$
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>Linux x86_64 wxGTK trunk static</name>
-    <builddir>brandt64_gtk</builddir>
-    <!--scheduler>daily_0800</scheduler-->
-    <steps>
-        <checkout/>
-        <configure options="--disable-shared --enable-opengl --enable-svg
-                            --enable-aui --with-gtk=2 --enable-graphics_ctx"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>
diff --git a/build/buildbot/config/run-tests.sh b/build/buildbot/config/run-tests.sh
deleted file mode 100755 (executable)
index eb22eae..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Run the test suites
-# Running them one at a time gives more readable results and shows up errors
-# in the suite names.
-set -e
-cd tests
-
-case `uname -sm` in
-    CYGWIN*|MINGW32*)   PATH=../lib:$PATH ;;
-    Darwin*)            DYLD_LIBRARY_PATH=../lib:$DYLD_LIBRARY_PATH ;;
-    *)                  LD_LIBRARY_PATH=../lib:$LD_LIBRARY_PATH ;;
-esac
-
-test -x test_gui && TEST_GUI=./test_gui
-ERR=0
-
-for prog in ./test $TEST_GUI; do
-    if [ -x $prog ]; then
-        SUITES=`$prog -l | grep '^  [^ ]'`
-        for SUITE in $SUITES; do
-            echo
-            echo $SUITE
-            echo $SUITE | sed 's/./-/g'
-            $prog $SUITE || ERR=1
-            echo
-        done
-    fi
-done
-
-exit $ERR