rename samba_3_X_test => samba_3_current and samba_3_X_devel => samba_3_master

metze

git-svn-id: file:///home/svn/build-farm/trunk@867 1e5ffdc8-eadd-0310-9daa-9cb4117fe24b

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index f65a287028a211226ff07107819e8da3eaeab027..e9d65fa4d7574590057aa9bb4de62bdfa5a8435b 100644 (file)
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -15,8 +15,8 @@ for compiler in cc ; do
 
        test_tree samba_4_0_test source $compiler
 
-       test_tree samba_3_X_test source $compiler
-       test_tree samba_3_X_devel source $compiler
+       test_tree samba_3_current source $compiler
+       test_tree samba_3_master source $compiler
 
 done
 

diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 673bfa0be29f097bd216260f8c7ebdf509e8dc0d..f91ae1ece1d12645129ebc755d654369fea6b8d2 100644 (file)
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -14,7 +14,7 @@ export SAMBA_MAXTIME
 . common.fns
 test_tree lorikeet-heimdal . $compiler
 CFLAGS="-g1 ${CFLAGS}" test_tree samba_4_0_test source $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_X_test source $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_X_devel source $compiler
+CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_current source $compiler
+CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_master source $compiler
 
 global_unlock

diff --git a/build_test.fns b/build_test.fns
index f23a2d9584d4fa32f3a0871cd119f66e31d63ad5..d6b34b2b58e07af624f5be86eacc812272cc57df 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -883,7 +883,7 @@ kill_old_processes() {
     (ps -fu $USER | grep /build | grep -v grep | egrep 'Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec' | awk '{print $2}' | xargs kill -9) 2> /dev/null
 }
 
-delete_old_svn_tree() {
+delete_old_tree() {
        otree=$1
 
        test -z "$otree" && return 0;
@@ -891,6 +891,8 @@ delete_old_svn_tree() {
        rm -rf $otree
        rm -rf $otree.svn
        rm -rf $otree.*.svn
+       rm -rf $otree.git
+       rm -rf $otree.*.git
        rm -rf s4selftest.$otree.*
        rm -rf build.$otree.*
 }
@@ -916,9 +918,11 @@ per_run_hook() {
        rm -f build.log
     fi
 
-    delete_old_svn_tree "samba_3_2"
-    delete_old_svn_tree "samba_3_2_test"
-    delete_old_svn_tree "samba4"
+    delete_old_tree "samba_3_2"
+    delete_old_tree "samba_3_2_test"
+    delete_old_tree "samba4"
+    delete_old_tree "samba_3_X_test"
+    delete_old_tree "samba_3_X_devel"
 }
 
 

diff --git a/charis.fns b/charis.fns
index c5196643a7d44e945fc80dd6cafbfcdfe9b199fc..dcee46f84959326c0bfec52a076ad1f9caa413c5 100755 (executable)
--- a/charis.fns
+++ b/charis.fns
@@ -8,11 +8,9 @@ global_lock
 system=`uname`
 
 compiler=gcc
-export config="--enable-automatic-dependencies --disable-gnutls"
+export config="--enable-automatic-dependencies"
 test_tree samba_4_0_test source gcc
-export config=""
-test_tree samba-gtk . gcc
 export config="--enable-merged-build"
-test_tree samba_3_X_devel source gcc
+test_tree samba_3_master source gcc
 
 global_unlock

diff --git a/fjall.fns b/fjall.fns
index 2f8461524b6a18f9e37276eceeda8a39ec944bf7..1bc9c7f7fca481e5b83f7b289ac4cedc231ca201 100644 (file)
--- a/fjall.fns
+++ b/fjall.fns
@@ -20,8 +20,8 @@ export SMBD_MAXTIME=18000
 export SAMBA_MAXTIME=18000
 
 test_tree samba_4_0_test source gcc
-test_tree samba_3_X_test source gcc
-test_tree samba_3_X_devel source gcc
+test_tree samba_3_current source gcc
+test_tree samba_3_master source gcc
 
 export TESTS_ENVIRONMENT="$PWD/lorikeet-heimdal/libtool --mode=execute valgrind --trace-children=yes --quiet -q --num-callers=30 --gen-suppressions=all --suppressions=$PWD/lorikeet-heimdal/cf/valgrind-suppressions"
 test_tree lorikeet-heimdal . gcc

diff --git a/generic.fns b/generic.fns
index e2505dca0014b21bc94111aa40b52d37b5c6a401..58c8c4e73a6279dcb0f4715bbb54cfd4ecd34d26 100644 (file)
--- a/generic.fns
+++ b/generic.fns
@@ -38,8 +38,8 @@ for compiler in gcc cc icc; do
         test_tree samba-gtk . $compiler
       fi
 
-      test_tree samba_3_X_test source $compiler
-      test_tree samba_3_X_devel source $compiler
+      test_tree samba_3_current source $compiler
+      test_tree samba_3_master source $compiler
 
       # by default build ppp only on SunOS or Linux systems
       if [ "$system" = Linux -o "$system" = SunOS ]; then

diff --git a/hape.fns b/hape.fns
index efa3de92ec9cab10dc3616a3caa80a5899cb7484..825670bfef62a0bee4eaf7399c9a76941f5bb8f3 100644 (file)
--- a/hape.fns
+++ b/hape.fns
@@ -25,9 +25,9 @@ for compiler in gcc ; do
        test_tree samba_4_0_test source $compiler
 
        export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-       test_tree samba_3_X_test source $compiler
+       test_tree samba_3_current source $compiler
        export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-       test_tree samba_3_X_devel source $compiler
+       test_tree samba_3_master source $compiler
 
 done
 

diff --git a/history b/history
index 4a7dd9197c5f1a1dde989656b7706fbf1d5607f0..c91e5f34a1a6216162243c8e8d0dd2fff1a73950 100755 (executable)
--- a/history
+++ b/history
@@ -17,8 +17,8 @@
 ./cvslog.pl /data/cvs/CVSROOT/ppp.updates 60 ppp "" cache/history.ppp
 
 ./gitlog.pl /data/git/rsync.git/ 60 master cache/history.rsync
-./gitlog.pl /data/git/samba.git/ 60 v3-3-test cache/history.samba_3_X_test
-./gitlog.pl /data/git/samba.git/ 60 master cache/history.samba_3_X_devel
+./gitlog.pl /data/git/samba.git/ 60 v3-3-test cache/history.samba_3_current
+./gitlog.pl /data/git/samba.git/ 60 master cache/history.samba_3_master
 ./gitlog.pl /data/git/samba.git/ 60 master cache/history.samba_4_0_test
 ./gitlog.pl /data/git/samba.git/ 60 master cache/history.libreplace lib/replace
 ./gitlog.pl /data/git/samba.git/ 60 master cache/history.talloc lib/talloc

diff --git a/m104.fns b/m104.fns
index 9f326195d23f76d502e65a21b85b52eef16ff9cd..e52523b7cd7f6e766a77cb81dfb5b7cab09d09b9 100644 (file)
--- a/m104.fns
+++ b/m104.fns
@@ -126,7 +126,7 @@ per_run_hook
 
 . common.fns
 
-test_tree samba_3_X_test source gcc
-test_tree samba_3_X_devel source gcc
+test_tree samba_3_current source gcc
+test_tree samba_3_master source gcc
 #Skip Samba4 until we shorten file names
 #test_tree samba_4_0_test source gcc

diff --git a/magni.fns b/magni.fns
index ce4c025ce673918fed48132761d6330186c0470f..e4fe2257265ff3d3c4d849f68baf8e6fdf465315 100644 (file)
--- a/magni.fns
+++ b/magni.fns
@@ -13,8 +13,8 @@ export PIDL_TESTS_SKIP=yes
 test_tree samba_4_0_test source $compiler 
 
 export config=""
-test_tree samba_3_X_test source $compiler
-test_tree samba_3_X_devel source $compiler
+test_tree samba_3_current source $compiler
+test_tree samba_3_master source $compiler
 
 #lcov and libtool disagree, enable OpenLDAP and disable OpenSSL
 export config="--with-ldap=/usr --without-openssl --disable-shared"

diff --git a/opi.fns b/opi.fns
index a0dbe96dde31302703effb85a5f41e876002d207..03033f8b174bbb452ed2f76cc021c91e16cbb771 100644 (file)
--- a/opi.fns
+++ b/opi.fns
@@ -13,9 +13,9 @@ export config="--with-selftest-prefix=/data/bf/st.samba_4_0_test"
 test_tree samba_4_0_test source $compiler
 export config=""
 
-test_tree samba_3_X_test source $compiler
+test_tree samba_3_current source $compiler
 export config="--enable-developer"
-test_tree samba_3_X_devel source $compiler
+test_tree samba_3_master source $compiler
 export config=""
 test_tree pidl . $compiler build test
 

diff --git a/snab.fns b/snab.fns
index c6c0979958fc7754a20e6039f6309d72a38b0c15..d58bd17132e606f2abe5ef026f76d9ea2f65121b 100644 (file)
--- a/snab.fns
+++ b/snab.fns
@@ -6,7 +6,7 @@ export CHECK_FLAGS="-Wall --beam::source=/home/tridge/beam/config.tcl --beam::pa
 # allow make cc_checker to take up to 7 hours
 export MAXTIME=25200
 
-for d in samba_4_0_test samba_3_X_test samba_3_X_devel; do
+for d in samba_4_0_test samba_3_current samba_3_master; do
     export CFLAGS="$CHECK_FLAGS --beam::data=/home/tridge/beam/$d"
     mkdir -p /home/tridge/beam/$d
     test_tree $d source checker configure config_log config_header build cc_checker install test

diff --git a/web/data.pm b/web/data.pm
index 928c87f75fa9c1cc8d51b9d8d3323cb3513a0664..4c5e4121ec79b980b5c3472dc2ad054ce3a10971 100644 (file)
--- a/web/data.pm
+++ b/web/data.pm
@@ -109,14 +109,14 @@ sub new($;$) {
                        'subdir' => '',
                        'srcdir' => ''
                },
-               'samba_3_X_test' => {
+               'samba_3_current' => {
                        'scm' => 'git',
                        'repo' => 'samba.git',
                        'branch' => 'v3-3-test',
                        'subdir' => '',
                        'srcdir' => 'source'
                },
-               'samba_3_X_devel' => {
+               'samba_3_master' => {
                        'scm' => 'git',
                        'repo' => 'samba.git',
                        'branch' => 'master',