Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'

Reviewed-by: Sam Thursfield

4 files changed, 2 insertions, 53 deletions

diff --git a/tests.build/build-system-with-null-refs.script b/tests.build/build-system-with-null-refs.script
deleted file mode 100755
index e23dcafa..00000000
--- a/tests.build/build-system-with-null-refs.script
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013  Codethink Limited
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-## Test building a system with null refs
-
-set -eu
-
-"$SRCDIR/scripts/test-morph" build-morphology \
-    test:morphs-repo master hello-system
diff --git a/tests.build/build-system-with-null-refs.setup b/tests.build/build-system-with-null-refs.setup
deleted file mode 100755
index cbf53076..00000000
--- a/tests.build/build-system-with-null-refs.setup
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013  Codethink Limited
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-set -eu
-
-cd "$DATADIR/morphs-repo"
-"$SRCDIR/scripts/nullify-local-refs" test:morphs master *.morph
-git add *.morph
-git commit --quiet -m "Nullify all refs"
diff --git a/tests.build/setup b/tests.build/setup
index 563482e6..8b1dfd0e 100755
--- a/tests.build/setup
+++ b/tests.build/setup
@@ -10,7 +10,7 @@
 # The stratum repository contains a single branch, "master", with a
 # stratum and a system morphology that include the chunk above.
 #
-# Copyright (C) 2011-2013  Codethink Limited
+# Copyright (C) 2011-2014  Codethink Limited
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -111,8 +111,6 @@ cat <<EOF > hello-system.morph
     "strata": [
         {
             "morph": "hello-stratum",
-            "repo": "test:morphs-repo",
-            "ref": "master"
         }
     ]
 }
diff --git a/tests.build/setup-build-essential b/tests.build/setup-build-essential
index 778716f1..5674020d 100755
--- a/tests.build/setup-build-essential
+++ b/tests.build/setup-build-essential
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Codethink Limited
+# Copyright (C) 2013-2014  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -117,8 +117,6 @@ cat <<EOF > "hello-stratum.morph"
     "build-depends": [
         {
             "morph": "build-essential",
-            "repo": "test:morphs-repo",
-            "ref": "master"
         }
     ],
     "chunks": [