diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
commit | ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e (patch) | |
tree | 6a738f64b517992eed10c3d5891bbb27840202e4 /tests.branching/workflow-separate-stratum-repos.script | |
parent | fe4486c1ec69c520a2c0aee7b52c35b57808120e (diff) | |
parent | 597f2a19363b7e91b928d814627c9236779998fb (diff) | |
download | morph-ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e.tar.gz |
Merge remote-tracking branch 'origin/baserock/richardmaw/S11284/morphologies-by-path-v4'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'tests.branching/workflow-separate-stratum-repos.script')
-rwxr-xr-x | tests.branching/workflow-separate-stratum-repos.script | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script deleted file mode 100755 index 1d8cc1e5..00000000 --- a/tests.branching/workflow-separate-stratum-repos.script +++ /dev/null @@ -1,72 +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. - - -## Do a complete workflow test, with strata outside the main morphologies -## repository. - -# FIXME: We don't know if we want to support this, and the new "morph -# edit" doesn't support it yet, also due to time constraints. -exit 0 - -set -eu - -. "$SRCDIR/scripts/setup-3rd-party-strata" - -# Make a change to the system -# FIXME: we should try and build it, too -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fixes - -# Edit one chunk -cd "me/readme-fixes" -"$SRCDIR/scripts/test-morph" edit hello -cd "$DATADIR/workspace/me/readme-fixes/test/stratum2-hello" -echo > README yoyoyo -git add README -git commit -m "Fix README in hello" --quiet - -# Edit the other chunk too -"$SRCDIR/scripts/test-morph" edit hello -cd "$DATADIR/workspace/me/readme-fixes/test/stratum3-hello" -echo > README yoyoyo -git add README -git commit -m "Fix README in hello" --quiet - -# Update the morphology repos -cd ../test/external-strata -git commit --quiet --all -m "Commit changes for system branch" - -cd ../test/morphs -git commit --quiet --all -m "Commit changes for system branch" - -# Merge our system branch into master -cd "$DATADIR/workspace" -cd master -"$SRCDIR/scripts/test-morph" merge me/readme-fixes - -# Check the changes have appeared -cd test/morphs -[ $(git rev-parse HEAD) = $(git rev-parse master) ] - -cd ../test/stratum2-hello -[ -e README ] -[ $(git rev-parse HEAD) = $(git rev-parse master) ] - -cd ../test/stratum3-hello -[ -e README ] -[ $(git rev-parse HEAD) = $(git rev-parse master) ] |