summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-12 11:04:47 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-12 11:04:47 +0000
commitdf8a5901bd886519b9fb06861d3c7a440d5ee7f1 (patch)
tree88e8abee217370345fb80229c5200a7d2b68329e
parentcffec56ed0eb9eb84c6c2bf85fb5927cfd3500ed (diff)
downloadmorph-df8a5901bd886519b9fb06861d3c7a440d5ee7f1.tar.gz
Remove edit-updates-stratum-build-depends test
This test stopped being fit for purpose after an accidental edit made it no longer check the stratum build depends. However, rather than fixing it, it should be removed, since we're changing morph's behaviour to not support morphologies in different repositories, which means that updating these refs is no longer necessary.
-rwxr-xr-xtests.branching/edit-updates-stratum-build-depends.script69
-rw-r--r--tests.branching/edit-updates-stratum-build-depends.stdout26
2 files changed, 0 insertions, 95 deletions
diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script
deleted file mode 100755
index a108ce8a..00000000
--- a/tests.branching/edit-updates-stratum-build-depends.script
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-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.
-
-
-## Verify that "morph edit" clones a chunk repository into a system branch.
-
-set -eu
-
-# Add a second stratum that build-depends on the first. We can ignore the fact
-# that both strata contain the same chunk for this test.
-cd "$DATADIR/morphs"
-
-cat <<EOF > xyzzy-stratum.morph
-build-depends:
-- morph: hello-stratum
- ref: master
- repo: test:morphs
-chunks:
-- build-depends: []
- name: hello
- ref: master
- repo: test:hello
-kind: stratum
-name: xyzzy-stratum
-EOF
-
-
-# Add the xyzzy-stratum to hello-system.
-awk '
-flag == 0 { print }
-/^strata:/ { flag=1; next }
-flag == 1 && /^[ -]/ { print; next }
-flag == 1 {
- print "- morph: xyzzy-stratum"
- print " ref: master"
- print " repo: test:morphs"
- print $0
- flag = 0
-}
-' hello-system.morph > temp
-mv temp hello-system.morph
-
-git add xyzzy-stratum.morph hello-system.morph
-git commit -q -m "Add 2nd stratum with a build dependency"
-
-# Create system branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
-
-# Edit chunk.
-"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
-
-# See what effect the editing had.
-"$SRCDIR/scripts/run-git-in" "newbranch/test:morphs" diff
diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout
deleted file mode 100644
index 7120ef50..00000000
--- a/tests.branching/edit-updates-stratum-build-depends.stdout
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/hello-stratum.morph b/hello-stratum.morph
-index 73ed482..475fe0f 100644
---- a/hello-stratum.morph
-+++ b/hello-stratum.morph
-@@ -2,7 +2,8 @@ chunks:
- - build-depends: []
- build-mode: test
- name: hello
-- ref: master
-+ ref: newbranch
- repo: test:hello
-+ unpetrify-ref: master
- kind: stratum
- name: hello-stratum
-diff --git a/hello-system.morph b/hello-system.morph
-index 3f7b4d3..199c924 100644
---- a/hello-system.morph
-+++ b/hello-system.morph
-@@ -3,5 +3,6 @@ kind: system
- name: hello-system
- strata:
- - morph: hello-stratum
-- ref: master
-+ ref: newbranch
- repo: test:morphs
-+ unpetrify-ref: master