rename samba_3_2_test into samba_3_X_test, so that

we don't have to change the build farm scripts to often...

metze

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

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 769b9e467f04c78a1be62b29875d6445d9573253..c7ff6de541b5dd4c0c98ea3f3607341df9e43b92 100644 (file)
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -14,7 +14,7 @@ for compiler in cc ; do
 
        test_tree samba_4_0_test source $compiler
 
-       test_tree samba_3_2_test source $compiler
+       test_tree samba_3_X_test source $compiler
 
 done
 

diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 456042b11e11a16a07fde091b9989e93a5bad300..1f10f101b92e11f5838e516b5bd280c86c7247a1 100644 (file)
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -12,6 +12,6 @@ export SMBD_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_2_test source $compiler
+CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_X_test source $compiler
 
 global_unlock

diff --git a/au2.fns b/au2.fns
index 5c8de8d99abd79ade2bb1b875fd6d161985dee22..9c4692696f276c94110f05f1068e1bf0b0f7c2bd 100644 (file)
--- a/au2.fns
+++ b/au2.fns
@@ -29,7 +29,7 @@ for compiler in gcc cc icc; do
         if which perl > /dev/null; then
           test_tree samba_4_0_test source $compiler
         fi
-        test_tree samba_3_2_test source $compiler
+        test_tree samba_3_X_test source $compiler
       fi
 
       # by default build ppp only on SunOS or Linux systems

diff --git a/berks.fns b/berks.fns
index f0c42e9bef69c16930685046ed041b8f4657f5ba..e0a103bb4a2cfc0b0542fdeaaf9e058970641015 100644 (file)
--- a/berks.fns
+++ b/berks.fns
@@ -25,7 +25,7 @@ for compiler in gcc cc icc; do
         test_tree samba_4_0_test source $compiler
       fi
 
-      test_tree samba_3_2_test source $compiler
+      test_tree samba_3_X_test source $compiler
 
       test_tree lorikeet-heimdal . $compiler
     fi

diff --git a/bnhtest.fns b/bnhtest.fns
index 147ad0c2b52d5c120d07093b74d04fec9b119ce8..132e79842fe0d12202dc0a502220097a5774ae33 100644 (file)
--- a/bnhtest.fns
+++ b/bnhtest.fns
@@ -16,7 +16,7 @@ compiler=gcc
 CFLAGS="-Wall"
 export CFLAGS
 
-      test_tree samba_3_2_test source $compiler
+      test_tree samba_3_X_test source $compiler
       test_tree rsync . $compiler
       test_tree distcc . $compiler
       test_tree ccache . $compiler

diff --git a/build_test.fns b/build_test.fns
index 63e6aad213a0bb6af0ceaf1101ef127ccb295eb5..70ba0d820033859bd4154a5322b44a0723a22fc5 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -906,6 +906,7 @@ per_run_hook() {
     fi
 
     delete_old_svn_tree "samba_3_2"
+    delete_old_svn_tree "samba_3_2_test"
     delete_old_svn_tree "samba4"
 }
 

diff --git a/fjall.fns b/fjall.fns
index bd98ce3b1d3cd446d0badee7c350cf75f83e461f..e2ff4872c624ee733d9db5d06ebdb931c7aa96ea 100644 (file)
--- a/fjall.fns
+++ b/fjall.fns
@@ -16,7 +16,7 @@ export TORTURE_MAXTIME=3600
 export SMBD_MAXTIME=18000
 
 test_tree samba_4_0_test source gcc
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test 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/fort.fns b/fort.fns
index da9a4743b9e4ee18461a98ede6295b5e00710335..4440498bd4655c687934a4f14bed7b80a864088f 100644 (file)
--- a/fort.fns
+++ b/fort.fns
@@ -9,7 +9,7 @@ export TORTURE_MAXTIME=3600
 export SMBD_MAXTIME=18000
 
 test_tree samba_4_0_test source gcc
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test 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 dd15ae44a120b4b43773b1aefd346b6f4d99416e..018ee5643e38c2c4688ad35b22ca00458bc57631 100644 (file)
--- a/generic.fns
+++ b/generic.fns
@@ -33,7 +33,7 @@ for compiler in gcc cc icc; do
         test_tree samba-gtk . $compiler
       fi
 
-      test_tree samba_3_2_test source $compiler
+      test_tree samba_3_X_test 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 7644b742f70b9b3abf0f827a3dc345f010b55dc9..d5e4fecd66ca9db0bb6018ff80b458e5cb74120e 100644 (file)
--- a/hape.fns
+++ b/hape.fns
@@ -24,7 +24,7 @@ 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_2_test source $compiler
+       test_tree samba_3_X_test source $compiler
 
 done
 

diff --git a/m104.fns b/m104.fns
index 1d7c4dd7f4c98f2377ea06015c4494658d3f995d..362be5572f7bab5e6c40404ecdd51af8d5bc1e9d 100644 (file)
--- a/m104.fns
+++ b/m104.fns
@@ -126,6 +126,6 @@ per_run_hook
 
 . common.fns
 
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test source gcc
 #Skip Samba4 until we shorten file names
 #test_tree samba_4_0_test source gcc

diff --git a/m12.fns b/m12.fns
index 75a1a7c58c5b9cbf68c28f74893780e274f06af1..46766c6418a3c92b0d14fff1f959410f64282be7 100644 (file)
--- a/m12.fns
+++ b/m12.fns
@@ -127,6 +127,6 @@ per_run_hook
 
 . common.fns
 
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test 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 3d92ee8949319e63522e31d2c2df0376aaa20e87..e3dad2f7514aefd3bf87016fe9ab1792b6e9fded 100644 (file)
--- a/magni.fns
+++ b/magni.fns
@@ -13,7 +13,7 @@ export PIDL_TESTS_SKIP=yes
 test_tree samba_4_0_test source $compiler 
 
 export config=""
-test_tree samba_3_2_test source $compiler
+test_tree samba_3_X_test source $compiler
 
 #lcov and libtool disagree, enable OpenLDAP and disable OpenSSL
 export config="--with-ldap=/usr --without-openssl --disable-shared"

diff --git a/naomi.fns b/naomi.fns
index c6efd9aec446afc4d57c73076679c1b57387ff57..fc75a993ecbfb467fc1fc44cbb6eb86c80655e0c 100644 (file)
--- a/naomi.fns
+++ b/naomi.fns
@@ -12,7 +12,7 @@ export PIDL_TESTS_SKIP=yes
 test_tree samba_4_0_test source $compiler 
 
 export config=""
-test_tree samba_3_2_test source $compiler
+test_tree samba_3_X_test 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 b985214c998c19dc380962f5221b98e86917a8b7..dda3933fded09cabcf132036306c4cb6f18102be 100644 (file)
--- a/opi.fns
+++ b/opi.fns
@@ -10,7 +10,7 @@ export CFLAGS
 #test_tree lorikeet-heimdal . $compiler
 
 test_tree samba_4_0_test source $compiler
-test_tree samba_3_2_test source $compiler
+test_tree samba_3_X_test source $compiler
 test_tree pidl . $compiler build test
 
 global_unlock

diff --git a/piglett.fns b/piglett.fns
index f57c639d3448658e8ed18109df48d7b7c3c24679..478f4d8bd284fcb42d594bcd217cfac303c3dd11 100644 (file)
--- a/piglett.fns
+++ b/piglett.fns
@@ -17,6 +17,6 @@ test_tree samba_4_0_test source gcc
 
 export config="--with-quotas --with-smbmount --enable-krb5developer"
 
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test source gcc
 
 global_unlock

diff --git a/shubnigurath.fns b/shubnigurath.fns
index 6c062814ea64ce884cae4e4049009592c670e62b..6c4b78b167046db96b7cd2cc5440a90a763cab1f 100644 (file)
--- a/shubnigurath.fns
+++ b/shubnigurath.fns
@@ -26,7 +26,7 @@ for compiler in gcc cc icc; do
           test_tree samba_4_0_test source $compiler
         fi
       fi
-      test_tree samba_3_2_test source $compiler
+      test_tree samba_3_X_test source $compiler
     fi
   fi
 done

diff --git a/snab.fns b/snab.fns
index 571c55f549084c50fcca2df95770e8ccda5212f3..c50e19e32276c406c41a28dfacbd1fc2cabca619 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_2_test; do
+for d in samba_4_0_test samba_3_X_test; 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/sun1.fns b/sun1.fns
index 5c8de8d99abd79ade2bb1b875fd6d161985dee22..9c4692696f276c94110f05f1068e1bf0b0f7c2bd 100644 (file)
--- a/sun1.fns
+++ b/sun1.fns
@@ -29,7 +29,7 @@ for compiler in gcc cc icc; do
         if which perl > /dev/null; then
           test_tree samba_4_0_test source $compiler
         fi
-        test_tree samba_3_2_test source $compiler
+        test_tree samba_3_X_test source $compiler
       fi
 
       # by default build ppp only on SunOS or Linux systems

diff --git a/tridge.fns b/tridge.fns
index 9c618f5ab299d5900b80cbc6d17f64f90d4c2a97..c150c2930d14318ab6065af96a0565bb6629c1e3 100644 (file)
--- a/tridge.fns
+++ b/tridge.fns
@@ -10,7 +10,7 @@ export PIDL_TESTS_SKIP=yes
 test_tree samba_4_0_test source $compiler 
 
 export config=""
-test_tree samba_3_2_test source $compiler
+test_tree samba_3_X_test source $compiler
 
 #lcov and libtool disagree, enable OpenLDAP and disable OpenSSL
 export config="--with-ldap=/usr --without-openssl --disable-shared"

diff --git a/us4.fns b/us4.fns
index 28eae89e3ef580594ecb95dcfa127a68a2821ca4..b8fba48ec71f97e98b08498319a151ca670bae17 100644 (file)
--- a/us4.fns
+++ b/us4.fns
@@ -16,9 +16,9 @@ test_tree samba_4_0_test source gcc
 test_tree samba_4_0_test source cc
 
 export config="--with-utmp --with-acl-support"
-test_tree samba_3_2_test source cc
+test_tree samba_3_X_test source cc
 
 export CFLAGS="-O -Wall"
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test source gcc
 
 

diff --git a/web/data.pm b/web/data.pm
index 7acebada31c2c928aaf62524a1d9b99c89ccdb9e..2d455a506fe6911ff14e58cd6e127f9477601c5a 100644 (file)
--- a/web/data.pm
+++ b/web/data.pm
@@ -147,7 +147,7 @@ sub build_age_ctime($$$$$)
 #      and trees.list
 my @git_trees = ("rsync",
                 "talloc",
-                "samba_3_2_test",
+                "samba_3_X_test",
                 "samba_4_0_test");
 
 ##############################################

diff --git a/web/history.pm b/web/history.pm
index a8a80a6147ac3f02e53f45c8e3dfcf29c2fa7015..9f57b3d4ef423e1ba2aaadd6aedbf1e07c35ed10 100644 (file)
--- a/web/history.pm
+++ b/web/history.pm
@@ -39,7 +39,7 @@ my (%bzr_trees) = ('ctdb' => " <a href=\"$UNPACKED_BASE/ctdb/%s\">%s</a>",
                    'python' => " <a href=\"$UNPACKED_BASE/python/%s\">%s</a>",
                    'samba-gtk' => " <a href=\"http://people.samba.org/bzr/jelmer/samba-gtk/trunk/%s\">%s</a>");
 
-my (%git_trees) = ('samba_3_2_test' =>" <a href=\"$GITWEB_BASE/?p=samba.git;a=history;f=%s;h=v3-2-test;hb=v3-2-test\">%s</a>",
+my (%git_trees) = ('samba_3_X_test' =>" <a href=\"$GITWEB_BASE/?p=samba.git;a=history;f=%s;h=v3-2-test;hb=v3-2-test\">%s</a>",
                   'samba_4_0_test' =>" <a href=\"$GITWEB_BASE/?p=samba.git;a=history;f=%s;h=v4-0-test;hb=v4-0-test\">%s</a>",
                   'libreplace' =>" <a href=\"$GITWEB_BASE/?p=samba.git;a=history;f=source/lib/replace/%s;h=v4-0-test;hb=v4-0-test\">%s</a>",
                   'talloc' =>" <a href=\"$GITWEB_BASE/?p=samba.git;a=history;f=source/lib/talloc/%s;h=v4-0-test;hb=v4-0-test\">%s</a>",

diff --git a/web/trees.list b/web/trees.list
index c63bd182ea9d488a9261590a44a4c25ceded1058..a959fef8ac7ce14d0184696753d43e4ce726a198 100644 (file)
--- a/web/trees.list
+++ b/web/trees.list
@@ -3,7 +3,7 @@
 samba_4_0_test:
 samba-docs:
 smb-build:
-samba_3_2_test:
+samba_3_X_test:
 rsync:
 distcc:
 ppp:

diff --git a/yowiee.fns b/yowiee.fns
index d6d19167ebeb17cdba5bd4ff4a23873ebe65755f..b4b04b15e9c85da2083a8c9d8f9bebe339e7b01f 100644 (file)
--- a/yowiee.fns
+++ b/yowiee.fns
@@ -11,6 +11,6 @@ test_tree samba_4_0_test source gcc
 
 export config="--with-quotas --with-smbmount --enable-krb5developer"
 
-test_tree samba_3_2_test source gcc
+test_tree samba_3_X_test source gcc
 
 global_unlock