summaryrefslogtreecommitdiff
path: root/tests.branching/workflow-separate-stratum-repos.script
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 15:51:01 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 18:53:48 +0000
commitb599757873d5f05e82647287dfd1387f2426e5c5 (patch)
tree45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.branching/workflow-separate-stratum-repos.script
parent25067e0ff261577da0ace26126c01e2829d7e5b7 (diff)
downloadmorph-b599757873d5f05e82647287dfd1387f2426e5c5.tar.gz
tests: Use test: URL prefix instead of baserock: throughout
Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
Diffstat (limited to 'tests.branching/workflow-separate-stratum-repos.script')
-rwxr-xr-xtests.branching/workflow-separate-stratum-repos.script16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script
index 6f77672e..97ddb95d 100755
--- a/tests.branching/workflow-separate-stratum-repos.script
+++ b/tests.branching/workflow-separate-stratum-repos.script
@@ -27,28 +27,28 @@ set -eu
# Make a change to the system
# FIXME: we should try and build it, too
cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fixes
+"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fixes
# Edit one chunk
cd "me/readme-fixes"
"$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello
-cd "$DATADIR/workspace/me/readme-fixes/baserock:stratum2-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-system stratum3 hello
-cd "$DATADIR/workspace/me/readme-fixes/baserock:stratum3-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 ../baserock:external-strata
+cd ../test:external-strata
git commit --quiet --all -m "Commit changes for system branch"
-cd ../baserock:morphs
+cd ../test:morphs
git commit --quiet --all -m "Commit changes for system branch"
# Merge our system branch into master
@@ -57,13 +57,13 @@ cd master
"$SRCDIR/scripts/test-morph" merge me/readme-fixes
# Check the changes have appeared
-cd baserock:morphs
+cd test:morphs
[ $(git rev-parse HEAD) = $(git rev-parse master) ]
-cd ../baserock:stratum2-hello
+cd ../test:stratum2-hello
[ -e README ]
[ $(git rev-parse HEAD) = $(git rev-parse master) ]
-cd ../baserock:stratum3-hello
+cd ../test:stratum3-hello
[ -e README ]
[ $(git rev-parse HEAD) = $(git rev-parse master) ]