summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-12 10:52:50 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-12 10:52:50 +0000
commitcffec56ed0eb9eb84c6c2bf85fb5927cfd3500ed (patch)
treeeccfa4ac02e298bc324d6fc8ae8ca64f1388c559
parent0fcd29a332c965d0889dee9c7e6551c2d31bb872 (diff)
downloadmorph-cffec56ed0eb9eb84c6c2bf85fb5927cfd3500ed.tar.gz
Remove test for tagging with multiple morphs repos
We don't support this any more, it makes morphologies complicated to implement and reason about.
-rwxr-xr-xtests.branching/tag-works-with-multiple-morphs-repos.script113
-rw-r--r--tests.branching/tag-works-with-multiple-morphs-repos.stdout176
2 files changed, 0 insertions, 289 deletions
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script
deleted file mode 100755
index f6ecbf32..00000000
--- a/tests.branching/tag-works-with-multiple-morphs-repos.script
+++ /dev/null
@@ -1,113 +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.
-
-
-## Check that "morph tag" works if morphologies are spread across multiple
-## repositories. In this case, it should copy all petrified morphologies
-## into the branch root repository and only create the tag there.
-
-set -eu
-
-# Make sure the commits always have the same SHA1s.
-. "$SRCDIR/scripts/fix-committer-info"
-
-# Create the first morphs repository.
-mkdir "$DATADIR/morphs1"
-
-# Create system morphology in first morphs repository.
-cat <<EOF > "$DATADIR/morphs1/test-system.morph"
-name: test-system
-kind: system
-arch: $(uname -m)
-strata:
-- morph: stratum1
- ref: master
- repo: test:morphs1
-- morph: stratum2
- ref: master
- repo: test:morphs2
-EOF
-
-# Create stratum that depends on another stratum.
-cat <<EOF > "$DATADIR/morphs1/stratum1.morph"
-name: stratum1
-kind: stratum
-build-depends:
-- morph: stratum3
- ref: master
- repo: test:morphs2
-chunks:
-- build-depends: []
- name: hello
- ref: master
- repo: test:hello
-EOF
-
-# Commit all files to the first repository.
-scripts/run-git-in "$DATADIR/morphs1" init -q
-scripts/run-git-in "$DATADIR/morphs1" add .
-scripts/run-git-in "$DATADIR/morphs1" commit -q -m initial
-
-# Create second morphs repository.
-mkdir "$DATADIR/morphs2"
-
-# Create two strata in the second repository.
-cat <<EOF > "$DATADIR/morphs2/stratum2.morph"
-name: stratum2
-kind: stratum
-build-depends:
-- morph: stratum3
- repo: test:morphs2
- ref: master
-chunks:
-- build-depends: []
- name: hello
- ref: master
- repo: test:hello
-EOF
-cat <<EOF > "$DATADIR/morphs2/stratum3.morph"
-kind: stratum
-name: stratum3
-chunks:
-- build-depends: []
- build-mode: test
- name: hello
- ref: master
- repo: test:hello
-EOF
-
-# Commit all files to the second repository.
-"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs2" init -q
-"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs2" add .
-"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs2" commit -q -m initial
-
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-
-# Check out the master system branch.
-"$SRCDIR/scripts/test-morph" \
- checkout test:morphs1 master
-
-# Tag the master system branch.
-"$SRCDIR/scripts/test-morph" \
- tag tag-across-multiple-repos -- -m "create tag"
-
-# Show the tag.
-GIT_DIR="$DATADIR/workspace/master/test:morphs1/.git" \
- git show tag-across-multiple-repos
-GIT_DIR="$DATADIR/workspace/master/test:morphs1/.git" \
- git log --format=fuller -n1 -p --stat tag-across-multiple-repos
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
deleted file mode 100644
index 81fbf20d..00000000
--- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
+++ /dev/null
@@ -1,176 +0,0 @@
-tag tag-across-multiple-repos
-Tagger: developer <developer@example.com>
-Date: Tue Jul 31 16:51:54 2012 +0000
-
-create tag
-
-commit 7323ed5dcc47715e7303fd36d537aef98a04df9a
-Author: developer <developer@example.com>
-Date: Tue Jul 31 16:51:54 2012 +0000
-
- create tag
-
-diff --git a/stratum1.morph b/stratum1.morph
-index 6d439df..074a838 100644
---- a/stratum1.morph
-+++ b/stratum1.morph
-@@ -2,10 +2,13 @@ name: stratum1
- kind: stratum
- build-depends:
- - morph: stratum3
-- ref: master
-- repo: test:morphs2
-+ ref: tag-across-multiple-repos
-+ repo: test:morphs1
-+ unpetrify-ref: master
-+ unpetrify-repo: test:morphs2
- chunks:
- - build-depends: []
- name: hello
-- ref: master
-+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
- repo: test:hello
-+ unpetrify-ref: master
-diff --git a/stratum2.morph b/stratum2.morph
-new file mode 100644
-index 0000000..0b421ab
---- /dev/null
-+++ b/stratum2.morph
-@@ -0,0 +1,14 @@
-+name: stratum2
-+kind: stratum
-+build-depends:
-+- morph: stratum3
-+ repo: test:morphs1
-+ ref: tag-across-multiple-repos
-+ unpetrify-ref: master
-+ unpetrify-repo: test:morphs2
-+chunks:
-+- build-depends: []
-+ name: hello
-+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
-+ repo: test:hello
-+ unpetrify-ref: master
-diff --git a/stratum3.morph b/stratum3.morph
-new file mode 100644
-index 0000000..610fae6
---- /dev/null
-+++ b/stratum3.morph
-@@ -0,0 +1,9 @@
-+kind: stratum
-+name: stratum3
-+chunks:
-+- build-depends: []
-+ build-mode: test
-+ name: hello
-+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
-+ repo: test:hello
-+ unpetrify-ref: master
-diff --git a/test-system.morph b/test-system.morph
-index 62d3b08..edb5745 100644
---- a/test-system.morph
-+++ b/test-system.morph
-@@ -3,8 +3,11 @@ kind: system
- arch: x86_64
- strata:
- - morph: stratum1
-- ref: master
-+ ref: tag-across-multiple-repos
- repo: test:morphs1
-+ unpetrify-ref: master
- - morph: stratum2
-- ref: master
-- repo: test:morphs2
-+ ref: tag-across-multiple-repos
-+ repo: test:morphs1
-+ unpetrify-ref: master
-+ unpetrify-repo: test:morphs2
-commit 7323ed5dcc47715e7303fd36d537aef98a04df9a
-Author: developer <developer@example.com>
-AuthorDate: Tue Jul 31 16:51:54 2012 +0000
-Commit: developer <developer@example.com>
-CommitDate: Tue Jul 31 16:51:54 2012 +0000
-
- create tag
----
- stratum1.morph | 9 ++++++---
- stratum2.morph | 14 ++++++++++++++
- stratum3.morph | 9 +++++++++
- test-system.morph | 9 ++++++---
- 4 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/stratum1.morph b/stratum1.morph
-index 6d439df..074a838 100644
---- a/stratum1.morph
-+++ b/stratum1.morph
-@@ -2,10 +2,13 @@ name: stratum1
- kind: stratum
- build-depends:
- - morph: stratum3
-- ref: master
-- repo: test:morphs2
-+ ref: tag-across-multiple-repos
-+ repo: test:morphs1
-+ unpetrify-ref: master
-+ unpetrify-repo: test:morphs2
- chunks:
- - build-depends: []
- name: hello
-- ref: master
-+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
- repo: test:hello
-+ unpetrify-ref: master
-diff --git a/stratum2.morph b/stratum2.morph
-new file mode 100644
-index 0000000..0b421ab
---- /dev/null
-+++ b/stratum2.morph
-@@ -0,0 +1,14 @@
-+name: stratum2
-+kind: stratum
-+build-depends:
-+- morph: stratum3
-+ repo: test:morphs1
-+ ref: tag-across-multiple-repos
-+ unpetrify-ref: master
-+ unpetrify-repo: test:morphs2
-+chunks:
-+- build-depends: []
-+ name: hello
-+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
-+ repo: test:hello
-+ unpetrify-ref: master
-diff --git a/stratum3.morph b/stratum3.morph
-new file mode 100644
-index 0000000..610fae6
---- /dev/null
-+++ b/stratum3.morph
-@@ -0,0 +1,9 @@
-+kind: stratum
-+name: stratum3
-+chunks:
-+- build-depends: []
-+ build-mode: test
-+ name: hello
-+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb
-+ repo: test:hello
-+ unpetrify-ref: master
-diff --git a/test-system.morph b/test-system.morph
-index 62d3b08..edb5745 100644
---- a/test-system.morph
-+++ b/test-system.morph
-@@ -3,8 +3,11 @@ kind: system
- arch: x86_64
- strata:
- - morph: stratum1
-- ref: master
-+ ref: tag-across-multiple-repos
- repo: test:morphs1
-+ unpetrify-ref: master
- - morph: stratum2
-- ref: master
-- repo: test:morphs2
-+ ref: tag-across-multiple-repos
-+ repo: test:morphs1
-+ unpetrify-ref: master
-+ unpetrify-repo: test:morphs2