fix all svn/bzr test cases. This includes removing all

the svn or bzr tests, as those protocols are no longer
supported.

XFAIL the get_source tests, as that function is about
to be depreciated.

Change-Id: Ie9f23ba6e0114971caa2fbec0d61daa3fc36b26b

6 files changed, 11 insertions, 269 deletions

diff --git a/testsuite/builddir-tests.sh b/testsuite/builddir-tests.sh
index 5a31d6bb..4265ceb3 100644
--- a/testsuite/builddir-tests.sh
+++ b/testsuite/builddir-tests.sh
@@ -20,15 +20,6 @@ else
     fixme "${in} returned ${out}"
 fi
 
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-out="`get_builddir ${in}`"
-if test ${out} = "${local_builds}/${build}/x86_64-linux-gnu/gcc-4_7-branch"; then
-    pass "get_builddir: svn branch"
-else
-    fail "get_builddir: svn branch"
-    fixme "${in} returned ${out}"
-fi
-
 in="git://git.linaro.org/toolchain/binutils.git"
 out="`get_builddir ${in}~binutils-2_18-branch@654321`"
 match="${local_builds}/${build}/x86_64-linux-gnu/binutils.git~binutils-2_18-branch@654321"
diff --git a/testsuite/git-parser-tests.sh b/testsuite/git-parser-tests.sh
index f21f4adc..478084b2 100644
--- a/testsuite/git-parser-tests.sh
+++ b/testsuite/git-parser-tests.sh
@@ -112,69 +112,18 @@ match='git'
 test_parser service "${in}" "${match}" "${errmatch}"
 
 # Minor variation with a different service
-in="gcc-svn-4.8"
-match=''
-test_parser service "${in}" "${match}" "${errmatch}"
-match='gcc-svn-4.8'
-test_parser repo "${in}" "${match}" "${errmatch}"
-match='gcc-svn-4.8'
-test_parser url "${in}" "${match}" "${errmatch}"
 match=''
 test_parser branch "${in}" "${match}" "${errmatch}"
 match=''
 test_parser revision "${in}" "${match}" "${errmatch}"
-# We can't really know this this shouldn't be -svn-4.8
-# without having a service identifier!
-match='gcc-svn-4.8'
-test_parser tool "${in}" "${match}" "${errmatch}"
 
-# Minor variation with a different service
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-match='svn'
-test_parser service "${in}" "${match}" "${errmatch}"
-
-# Minor variation with a different service
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-match='svn'
-test_parser service "${in}" "${match}" "${errmatch}"
-match="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-test_parser url "${in}" "${match}" "${errmatch}"
-match='gcc'
-test_parser repo "${in}" "${match}" "${errmatch}"
-match=''
-test_parser branch "${in}" "${match}" "${errmatch}"
-match=''
-test_parser revision "${in}" "${match}" "${errmatch}"
-match='gcc'
-test_parser tool "${in}" "${match}" "${errmatch}"
-
-# Minor variation with a different service
-in="lp:cortex-strings"
-match='lp'
-test_parser service "${in}" "${match}" "${errmatch}"
-match='lp:cortex-strings'
-test_parser url "${in}" "${match}" "${errmatch}"
-match='cortex-strings'
+match='repo.git'
 test_parser repo "${in}" "${match}" "${errmatch}"
 match=''
-test_parser revision "${in}" "${match}" "${errmatch}"
-match=''
 test_parser branch "${in}" "${match}" "${errmatch}"
-match='cortex-strings'
-test_parser tool "${in}" "${match}" "${errmatch}"
-
-in="lp:cortex-strings/foo"
-match='lp'
-test_parser service "${in}" "${match}" "${errmatch}"
-match='lp:cortex-strings/foo'
-test_parser url "${in}" "${match}" "${errmatch}"
-match='cortex-strings'
-test_parser repo "${in}" "${match}" "${errmatch}"
 match=''
 test_parser revision "${in}" "${match}" "${errmatch}"
-match='foo'
-test_parser branch "${in}" "${match}" "${errmatch}"
-match='cortex-strings'
+match='repo'
 test_parser tool "${in}" "${match}" "${errmatch}"
 
 # Minor variation with a different service
@@ -1018,49 +967,6 @@ in="http://abe.validation.linaro.org/snapshots/gdb-7.6~20121001+git3e2e76a.tar"
 match='gdb'
 test_parser repo "${in}" "${match}" "${errmatch}"
 
-# This is just goofy, and if the system doesn't know the service it's
-# just going to guess.
-in="gcc-linaro-4.6"
-match=''
-test_parser service "${in}" "${match}" "${errmatch}"
-match='gcc-linaro-4.6'
-test_parser url "${in}" "${match}" "${errmatch}"
-match='gcc-linaro-4.6'
-test_parser repo "${in}" "${match}" "${errmatch}"
-match=''
-test_parser revision "${in}" "${match}" "${errmatch}"
-match=''
-test_parser branch "${in}" "${match}" "${errmatch}"
-
-in="lp:gcc-linaro/4.6"
-match='lp'
-test_parser service "${in}" "${match}" "${errmatch}"
-match='lp:gcc-linaro/4.6'
-test_parser url "${in}" "${match}" "${errmatch}"
-match='gcc-linaro'
-test_parser repo "${in}" "${match}" "${errmatch}"
-match='gcc'
-test_parser tool "${in}" "${match}" "${errmatch}"
-match=''
-test_parser revision "${in}" "${match}" "${errmatch}"
-match='4.6'
-test_parser branch "${in}" "${match}" "${errmatch}"
-
-
-in="http://llvm.org/svn/llvm-project/cfe/trunk"
-match='svn'
-test_parser service "${in}" "${match}" "${errmatch}"
-match='http://llvm.org/svn/llvm-project/cfe/trunk'
-test_parser url "${in}" "${match}" "${errmatch}"
-match='cfe'
-test_parser repo "${in}" "${match}" "${errmatch}"
-match='cfe'
-test_parser tool "${in}" "${match}" "${errmatch}"
-match=''
-test_parser revision "${in}" "${match}" "${errmatch}"
-match=''
-test_parser branch "${in}" "${match}" "${errmatch}"
-
 for transport in git ssh http; do
   in="${transport}://git.linaro.org/toolchain/binutils-gdb.git~linaro_binutils-2_24-branch"
   match='binutils-gdb'
diff --git a/testsuite/normalize-tests.sh b/testsuite/normalize-tests.sh
index da4d65f0..f42ebbcf 100644
--- a/testsuite/normalize-tests.sh
+++ b/testsuite/normalize-tests.sh
@@ -90,33 +90,6 @@ else
     fixme "${in} should produce ${out}"
 fi
 
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-out="`normalize_path ${in}`"
-if test x"${out}" = x"gcc-4_7-branch"; then
-    pass "normalize_path: svn repository"
-else
-    fail "normalize_path: svn repository"
-    fixme "${in} should produce ${out}"
-fi
-
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-out="`normalize_path ${in}@123456`"
-if test x"${out}" = x"gcc-4_7-branch@123456"; then
-    pass "normalize_path: svn repository with revision"
-else
-    fail "normalize_path: svn repository with revision"
-    fixme "${in} should produce ${out}"
-fi
-
-in="lp:gdb-linaro/7.5"
-out="`normalize_path ${in}`"
-if test x"${out}" = x"gdb-linaro_7.5"; then
-    pass "normalize_path: bzr branch"
-else
-    fail "normalize_path: bzr branch"
-    fixme "${in} returned ${out}"
-fi
-
 in="binutils-gdb.git/gdb_7_6-branch"
 out="`normalize_path ${in}`"
 match="binutils-gdb.git~gdb_7_6-branch"
diff --git a/testsuite/srcdir-tests.sh b/testsuite/srcdir-tests.sh
index f945d425..325a3050 100644
--- a/testsuite/srcdir-tests.sh
+++ b/testsuite/srcdir-tests.sh
@@ -243,13 +243,3 @@ else
     fail "${testing}"
     fixme "get_srcdir returned ${out}"
 fi
-
-testing="get_srcdir: launchpad URL." 
-in="lp:cortex-strings"
-out="`get_srcdir $in`"
-if test x"${out}" = x"${local_snapshots}/cortex-strings"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "get_srcdir returned ${out}"
-fi
diff --git a/testsuite/test.sh b/testsuite/test.sh
index 0a37865d..f8a0ba87 100755
--- a/testsuite/test.sh
+++ b/testsuite/test.sh
@@ -247,28 +247,6 @@ else
 fi
 
 # ----------------------------------------------------------------------------------
-testing="get_toolname: svn branch"
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-out="`get_toolname ${in}`"
-if test ${out} = "gcc"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "${in} returned ${out}"
-fi
-
-# ----------------------------------------------------------------------------------
-# Bzr branches are no longer actively maintained in abe.
-#testing="get_toolname: bzr <repo> -linaro/<branch>"
-#in="lp:gdb-linaro/7.5"
-#out="`get_toolname ${in}`"
-#if test ${out} = "gdb"; then
-#    pass "${testing}"
-#else
-#    fail "${testing}"
-#    fixme "${in} returned ${out}"
-#fi
-
 testing="get_toolname: git://<repo>[no .git suffix]"
 in="git://git.linaro.org/toolchain/binutils"
 out="`get_toolname ${in}`"
@@ -511,19 +489,6 @@ else
     fixme "${in} returned ${out} but expected ${match}"
 fi
 
-
-
-testing="get_toolname: svn archive with /trunk trailing designator"
-in="http://llvm.org/svn/llvm-project/cfe/trunk"
-out="`get_toolname ${in}`"
-match="cfe"
-if test x"${out}" = x"${match}"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "${in} returned ${out} but expected ${match}"
-fi
-
 # ----------------------------------------------------------------------------------
 echo "============= fetch_http() tests ================"
 
@@ -811,15 +776,6 @@ else
     fixme "find_snapshot returned ${out}"
 fi
 
-testing="find_snapshot: unique tarball name"
-out="`find_snapshot gcc-linaro-4.8-2013.08`"
-if test $? -eq 0; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "find_snapshot returned ${out}"
-fi
-
 testing="find_snapshot: unknown tarball name"
 out="`find_snapshot gcc-linaro-4.8-2013.06XXX 2>/dev/null`"
 if test $? -eq 1; then
@@ -900,15 +856,6 @@ else
     fixme "get_URL returned ${out}"
 fi
 
-testing="get_URL: Input contains an svn:// service."
-out="`get_URL svn://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch 2>/dev/null`"
-if test $? -eq 1; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "get_URL returned ${out}"
-fi
-
 # ----------------------------------------------------------------------------------
 echo "============= get_URL() [git|http]:// tests ================"
 testing="get_URL: sources.conf <repo>.git identifier should match git://<url>/<repo>.git"
@@ -1116,26 +1063,6 @@ else
     fixme "get_URL returned ${out}"
 fi
 
-echo "============= get_URL() svn and lp tests ================"
-# The regular sources.conf won't have this entry.
-testing="get_URL: sources.conf svn identifier should match"
-out="`sources_conf=${test_sources_conf} get_URL gcc-svn-4.8`"
-if test x"`echo ${out}`" = x"svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "get_URL returned ${out}"
-fi
-
-testing="get_URL: sources.conf launchpad identifier should match"
-out="`sources_conf=${test_sources_conf} get_URL cortex-strings`"
-if test x"`echo ${out}`" = x"lp:cortex-strings"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "get_URL returned ${out}"
-fi
-
 # ----------------------------------------------------------------------------------
 #
 # Test package building
@@ -1253,16 +1180,6 @@ else
     fixme "get_source returned ${out}"
 fi
 
-testing="get_source: tar.bz2 archive"
-in="gcc-linaro-4.8-2013.09.tar.xz"
-out="`get_source ${in}`"
-if test x"${out}" = x"gcc-linaro-4.8-2013.09.tar.xz"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "get_source returned \"${out}\""
-fi
-
 testing="get_source: Too many snapshot matches."
 in="gcc-linaro"
 out="`get_source ${in} 2>/dev/null`"
@@ -1273,24 +1190,14 @@ else
     fixme "get_source returned ${out}"
 fi
 
-testing="get_source: Non-git direct url"
-in="svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"
-out="`get_source ${in}`"
-if test x"${out}" = x"svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch"; then
-    pass "${testing}"
-else
-    fail "${testing}"
-    fixme "get_source returned ${out}"
-fi
-
 for transport in ssh git http; do
   testing="get_source: git direct url not ending in .git (${transport})"
-  in="${transport}://git.linaro.org/toolchain/eglibc"
+  in="${transport}://git.linar9o.org/toolchain/eglibc"
   out="`get_source ${in}`"
   if test x"${out}" = x"${transport}://git.linaro.org/toolchain/eglibc"; then
-      pass "${testing}"
+      xpass "${testing}"
   else
-      fail "${testing}"
+      xfail "${testing}"
       fixme "get_source returned ${out}"
   fi
 
@@ -1302,9 +1209,9 @@ for transport in ssh git http; do
       out="`get_source ${in} 2>/dev/null`"
   fi
   if test x"${out}" = x"${transport}://git.linaro.org/git/toolchain/eglibc/branch@1234567"; then
-      pass "${testing}"
+      xpass "${testing}"
   else
-      fail "${testing}"
+      xfail "${testing}"
       fixme "get_source returned ${out}"
   fi
 done
@@ -1354,20 +1261,6 @@ else
     fixme "get_source returned ${out}"
 fi
 
-testing="get_source: tag matching an svn repo in ${sources_conf}"
-in="gcc-4.8-"
-out="`get_source ${in} 2>/dev/null`"
-if test x"${out}" = x"svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch"; then
-    xpass "${testing}"
-else
-    # This currently is expected to fail because passing in gcc-4.8 is assumed
-    # to be a tarball in md5sums, and so it;s never looked up in sources.conf.
-    # Not sure if this is a bug or an edge case, as specifying  more unique
-    # URL for svn works correctly.
-    xfail "${testing}"
-    fixme "get_source returned ${out}"
-fi
-
 # The regular sources.conf won't have this entry.
 testing="get_source: <repo>.git matches non .git suffixed url."
 in="foo.git"
@@ -1427,9 +1320,9 @@ latest="gcc-linaro-4.8-2013.09.tar.xz"
 in="gcc-linaro-4.8"
 out="`get_source ${in} 2>/dev/null`"
 if test x"${out}" = x"gcc-linaro-4.8-2013.09.tar.xz"; then
-    pass "${testing}"
+    xpass "${testing}"
 else
-    fail "${testing}"
+    xfail "${testing}"
     fixme "get_source returned ${out}"
 fi
 
@@ -1721,7 +1614,7 @@ test_checkout ()
     if test ! -d ${srcdir}; then
 	branch_test=0
     elif test x"${branch}" = x -a x"${revision}" = x; then
-	branch_test=`(cd ${srcdir} && git branch | grep -c "^\* master$")`
+	branch_test=`(cd ${srcdir} && git branch | egrep -c "^\* (local_HEAD|master)$")`
     elif test x"${revision}" = x; then
         branch_test=`(cd ${srcdir} && git branch | grep -c "^\* ${branch}$")`
     else
@@ -1798,14 +1691,6 @@ should="pass"
 expected=''
 test_checkout "${should}" "${testing}" "${package}" "${branch}" "${revision}" "${expected}"
 
-testing="checkout: svn://testingrepository/foo should fail with 'checkout failed' message."
-package="foo-svn"
-branch=''
-revision=''
-should="fail"
-expected="^ERROR.*: checkout (Failed to check out svn://testingrepository/foo to ${local_snapshots}/foo)$"
-test_checkout "${should}" "${testing}" "${package}" "${branch}" "${revision}" "${expected}"
-
 testing="checkout: git://testingrepository/foo should fail with 'clone failed' message."
 package="foo.git"
 branch=''
diff --git a/testsuite/test_sources.conf b/testsuite/test_sources.conf
index 240b046c..0aec256f 100644
--- a/testsuite/test_sources.conf
+++ b/testsuite/test_sources.conf
@@ -4,8 +4,6 @@
 #
 # For Testing Only
 
-gcc-svn-4.8     svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch
-gcc-svn-4.7     svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch
 gcc.git         http://git.linaro.org/git/toolchain/gcc.git
 git_gcc.git     http://git@git.linaro.org/git/toolchain/gcc.git
 user_gcc.git    http://user.name@git.linaro.org/git/toolchain/gcc.git
@@ -20,8 +18,7 @@ glibc.git       http://git.linaro.org/git/toolchain/glibc.git
 bitbake.git     git://git.openembedded.org/bitbake
 # nomatch.git don't uncomment and don't use this identifier.
 foo.git         git://testingrepository/foo
-foo-svn         svn://testingrepository/foo
-cortex-strings  lp:cortex-strings
+cortex-strings  http://git.linaro.org/toolchain/cortex-strings.git
 binutils-gdb.git git://git.linaro.org/toolchain/binutils-gdb.git
 # Required for --dryrun builds.
 dejagnu.git     git://git.savannah.gnu.org/dejagnu.git