summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-14 15:49:50 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 17:07:10 +0000
commitb2c52b4634f7893aa441c551ead25599a5373fbb (patch)
treec6dd7d5ea065584fcd6b566c70ada22a07fa2299
parentac770fd2ad9bbe9da8671e4e0d484785213073cc (diff)
downloadmorph-b2c52b4634f7893aa441c551ead25599a5373fbb.tar.gz
Remove morph tag cmdtests
They hard-code the expected sha1, so break the test suite for anything but x86_64. If we decide tag has a place in the new world order, yarns can be made, but until then, we're better off without these tests.
-rwxr-xr-xtests.branching/tag-creates-commit-and-tag.script39
-rw-r--r--tests.branching/tag-creates-commit-and-tag.stdout44
-rwxr-xr-xtests.branching/tag-tag-works-as-expected.script46
-rw-r--r--tests.branching/tag-tag-works-as-expected.stdout48
4 files changed, 0 insertions, 177 deletions
diff --git a/tests.branching/tag-creates-commit-and-tag.script b/tests.branching/tag-creates-commit-and-tag.script
deleted file mode 100755
index 8fd45d16..00000000
--- a/tests.branching/tag-creates-commit-and-tag.script
+++ /dev/null
@@ -1,39 +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 example-tag' successfully creates a dangling
-## commit and an annotated tag pointing to this commit.
-
-set -eu
-
-# Make sure the commits always have the same SHA1s.
-. "$SRCDIR/scripts/fix-committer-info"
-
-# Create a workspace and branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-
-# Tag the system branch.
-"$SRCDIR/scripts/test-morph" tag example-tag -- -m Message
-
-# Show the tag itself and its log. This allows to verify a couple of things,
-# including that the commit and tag are created, that the commit message is
-# set correctly and that all references are petrified.
-"$SRCDIR/scripts/test-morph" foreach -- git show example-tag
-"$SRCDIR/scripts/test-morph" foreach -- git log --format=fuller example-tag
diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout
deleted file mode 100644
index 335e6a31..00000000
--- a/tests.branching/tag-creates-commit-and-tag.stdout
+++ /dev/null
@@ -1,44 +0,0 @@
-test:morphs
-tag example-tag
-Tagger: developer <developer@example.com>
-Date: Tue Jul 31 16:51:54 2012 +0000
-
-Message
-
-commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0
-Author: developer <developer@example.com>
-Date: Tue Jul 31 16:51:54 2012 +0000
-
- Message
-
-diff --git a/hello-stratum.morph b/hello-stratum.morph
-index e012b5f..50da61b 100644
---- a/hello-stratum.morph
-+++ b/hello-stratum.morph
-@@ -3,6 +3,7 @@ kind: stratum
- chunks:
- - name: hello
- repo: test:hello
-- ref: master
-+ ref: 293fa0b08f0382c63181c36b6efa602876aa8c87
-+ unpetrify-ref: master
- build-depends: []
- build-mode: test
-
-test:morphs
-commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0
-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
-
- Message
-
-commit dc323150575be26e3df0d2dab678560c04281b9f
-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
-
- initial
-
diff --git a/tests.branching/tag-tag-works-as-expected.script b/tests.branching/tag-tag-works-as-expected.script
deleted file mode 100755
index 95315de4..00000000
--- a/tests.branching/tag-tag-works-as-expected.script
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-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
-# 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 tagging an existing tag commit with 'morph tag' preserves
-## the unpetrify-ref and does not "double-petrify" apart from updating
-## references to "example-tag" to "tagged-tag".
-
-set -eu
-
-# Make sure the commits always have the same SHA1s.
-. "$SRCDIR/scripts/fix-committer-info"
-
-# Create a workspace and branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-
-# Tag the system branch.
-"$SRCDIR/scripts/test-morph" tag example-tag -- -m First
-
-# Check out the tag.
-"$SRCDIR/scripts/run-git-in" master/test/morphs checkout -b example-tag \
- 2>/dev/null
-
-# Tag the tag.
-"$SRCDIR/scripts/test-morph" tag tagged-tag -- -m Second
-
-# List all tags and show the second one.
-"$SRCDIR/scripts/test-morph" foreach -- git tag -l
-"$SRCDIR/scripts/test-morph" foreach -- git show tagged-tag
-"$SRCDIR/scripts/test-morph" foreach -- git log --format=fuller tagged-tag
diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout
deleted file mode 100644
index c3d723d7..00000000
--- a/tests.branching/tag-tag-works-as-expected.stdout
+++ /dev/null
@@ -1,48 +0,0 @@
-test:morphs
-example-tag
-tagged-tag
-
-test:morphs
-tag tagged-tag
-Tagger: developer <developer@example.com>
-Date: Tue Jul 31 16:51:54 2012 +0000
-
-Second
-
-commit ed4fa3a98076e92d61983202ed44455b3689bc16
-Author: developer <developer@example.com>
-Date: Tue Jul 31 16:51:54 2012 +0000
-
- Second
-
-diff --git a/hello-stratum.morph b/hello-stratum.morph
-index e012b5f..50da61b 100644
---- a/hello-stratum.morph
-+++ b/hello-stratum.morph
-@@ -3,6 +3,7 @@ kind: stratum
- chunks:
- - name: hello
- repo: test:hello
-- ref: master
-+ ref: 293fa0b08f0382c63181c36b6efa602876aa8c87
-+ unpetrify-ref: master
- build-depends: []
- build-mode: test
-
-test:morphs
-commit ed4fa3a98076e92d61983202ed44455b3689bc16
-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
-
- Second
-
-commit dc323150575be26e3df0d2dab678560c04281b9f
-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
-
- initial
-