summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-stratum-field-ordering.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.merging/conflict-stratum-field-ordering.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.merging/conflict-stratum-field-ordering.script')
-rwxr-xr-xtests.merging/conflict-stratum-field-ordering.script18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script
index 071d5204..3c1dce1c 100755
--- a/tests.merging/conflict-stratum-field-ordering.script
+++ b/tests.merging/conflict-stratum-field-ordering.script
@@ -36,19 +36,19 @@ cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
# Create stable branch to merge TO
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test/stable
-cd test/stable/baserock:morphs
+"$SRCDIR/scripts/test-morph" branch test:morphs test/stable
+cd test/stable/test:morphs
git push --quiet origin test/stable
# Create feature branch to merge FROM
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test/feature test/stable
+"$SRCDIR/scripts/test-morph" branch test:morphs test/feature test/stable
# Need 2 chunks!
# Make a change in TO
cd "$DATADIR/workspace/test/stable"
"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum
-cd baserock:morphs
+cd test:morphs
cat <<EOF > "hello-stratum.morph"
{
"name": "hello-stratum",
@@ -56,14 +56,14 @@ cat <<EOF > "hello-stratum.morph"
"chunks": [
{
"name": "hello-runtime",
- "repo": "baserock:hello",
+ "repo": "test:hello",
"ref": "master",
"morph": "hello",
"build-depends": []
},
{
"name": "hello-devel",
- "repo": "baserock:hello",
+ "repo": "test:hello",
"ref": "master",
"morph": "hello",
"build-depends": []
@@ -76,7 +76,7 @@ git commit --quiet --all -m "Split up 'hello' chunk into runtime and devel"
# Make a change in FROM that isn't very mergable
cd "$DATADIR/workspace/test/feature"
"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum
-cd baserock:morphs
+cd test:morphs
cat <<EOF > "hello-stratum.morph"
{
"name": "hello-stratum",
@@ -84,14 +84,14 @@ cat <<EOF > "hello-stratum.morph"
"chunks": [
{
"name": "hello-devel",
- "repo": "baserock:hello",
+ "repo": "test:hello",
"ref": "master",
"morph": "hello",
"build-depends": []
},
{
"name": "hello-runtime",
- "repo": "baserock:hello",
+ "repo": "test:hello",
"ref": "master",
"morph": "hello",
"build-depends": []