diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-20 14:58:46 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-21 10:20:51 +0000 |
commit | 2172c4332e8ee26aba28824293faa552867c4d35 (patch) | |
tree | f139d17f1d4f7339e47cd2c47ee202573a230f53 /tests.branching.disabled | |
parent | f4d3cbaf1d6e5c3bdbb1b2e2c18822ecc25c1ac5 (diff) | |
download | morph-2172c4332e8ee26aba28824293faa552867c4d35.tar.gz |
Revert "Remove petrify and unpetrify commands"
This reverts commit d63f41dadf5aa96a8d9254d31e92711ee160245e.
Diffstat (limited to 'tests.branching.disabled')
-rwxr-xr-x | tests.branching.disabled/workflow-petrify.script | 67 | ||||
-rw-r--r-- | tests.branching.disabled/workflow-petrify.stdout | 152 |
2 files changed, 219 insertions, 0 deletions
diff --git a/tests.branching.disabled/workflow-petrify.script b/tests.branching.disabled/workflow-petrify.script new file mode 100755 index 00000000..3c561d5b --- /dev/null +++ b/tests.branching.disabled/workflow-petrify.script @@ -0,0 +1,67 @@ +#!/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. + + +## Do a complete workflow test, with strata outside the main morphologies +## repository. + +set -eu + +. "$SRCDIR/scripts/setup-3rd-party-strata" + +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify + +cd test/petrify +"$SRCDIR/scripts/test-morph" petrify + +echo "test/petrify after petrifying:" +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph + +"$SRCDIR/scripts/test-morph" edit hello + +echo +echo "test/petrify after editing a chunk:" +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph + +# me/readme-fixes in test:stratum2-hello should be 'master', but +# that's the only ref upstream so we can infer that it is if we got here + +cd test:morphs +git commit --quiet --all -m "Petrify branch test/petrify" +git push --quiet origin test/petrify +cd ../test:external-strata +git commit --quiet --all -m "Petrify branch test/petrify" +git push --quiet origin test/petrify + +# unpetrify is easy enough. Let's try unpetrifying a different branch that +# was forked off the original while it was petrified, instead. +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" branch test:morphs test/unpetrify test/petrify + +cd test/unpetrify +"$SRCDIR/scripts/test-morph" unpetrify + +echo +echo "test/unpetrify after unpetrifying:" +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph diff --git a/tests.branching.disabled/workflow-petrify.stdout b/tests.branching.disabled/workflow-petrify.stdout new file mode 100644 index 00000000..a0ce82f4 --- /dev/null +++ b/tests.branching.disabled/workflow-petrify.stdout @@ -0,0 +1,152 @@ +test/petrify after petrifying: +{ + "name": "hello-system", + "kind": "system", + "arch": "x86_64", + "strata": [ + { + "morph": "hello-stratum", + "repo": "test:morphs", + "ref": "test/petrify" + }, + { + "morph": "stratum2", + "repo": "test:external-strata", + "ref": "test/petrify" + }, + { + "morph": "stratum3", + "repo": "test:external-strata", + "ref": "test/petrify" + } + ] +} +{ + "name": "stratum2", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:stratum2-hello", + "ref": "f4730636e429149bb923fa16be3aa9802d484b23", + "build-mode": "test", + "build-depends": [], + "unpetrify-ref": "master" + } + ] +} +{ + "name": "stratum3", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:stratum3-hello", + "ref": "f4730636e429149bb923fa16be3aa9802d484b23", + "build-mode": "test", + "build-depends": [], + "unpetrify-ref": "master" + } + ] +} + +test/petrify after editing a chunk: +{ + "name": "hello-system", + "kind": "system", + "arch": "x86_64", + "strata": [ + { + "morph": "hello-stratum", + "repo": "test:morphs", + "ref": "test/petrify" + }, + { + "morph": "stratum2", + "repo": "test:external-strata", + "ref": "test/petrify" + }, + { + "morph": "stratum3", + "repo": "test:external-strata", + "ref": "test/petrify" + } + ] +} +{ + "name": "stratum2", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:stratum2-hello", + "ref": "test/petrify", + "build-mode": "test", + "build-depends": [] + } + ] +} +{ + "name": "stratum3", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:stratum3-hello", + "ref": "f4730636e429149bb923fa16be3aa9802d484b23", + "build-mode": "test", + "build-depends": [], + "unpetrify-ref": "master" + } + ] +} + +test/unpetrify after unpetrifying: +{ + "name": "hello-system", + "kind": "system", + "arch": "x86_64", + "strata": [ + { + "morph": "hello-stratum", + "repo": "test:morphs", + "ref": "test/unpetrify" + }, + { + "morph": "stratum2", + "repo": "test:external-strata", + "ref": "test/unpetrify" + }, + { + "morph": "stratum3", + "repo": "test:external-strata", + "ref": "test/unpetrify" + } + ] +} +{ + "name": "stratum2", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:stratum2-hello", + "ref": "test/petrify", + "build-mode": "test", + "build-depends": [] + } + ] +} +{ + "name": "stratum3", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:stratum3-hello", + "ref": "master", + "build-mode": "test", + "build-depends": [] + } + ] +} |