diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
| commit | 19b16a2cc6d67871d0a4298354eb446ada136a8e (patch) | |
| tree | 01361b4995f97e26dfa6db56c685bc51a7f8b122 | |
| parent | 6eca890690217136a9685ca9ac55f6ea59882e9c (diff) | |
| parent | eeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 (diff) | |
| download | definitions-19b16a2cc6d67871d0a4298354eb446ada136a8e.tar.gz | |
Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/morph
88 files changed, 376 insertions, 420 deletions
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata index 49eca394..a2a8b1e5 100644 --- a/scripts/setup-3rd-party-strata +++ b/scripts/setup-3rd-party-strata @@ -53,7 +53,7 @@ cat <<EOF > "$1/$2.morph" "chunks": [ { "name": "hello", - "repo": "baserock:$2-hello", + "repo": "test:$2-hello", "ref": "master", "build-depends": [] } @@ -62,7 +62,7 @@ cat <<EOF > "$1/$2.morph" EOF } -# Create two more strata outside the baserock:morphs repository +# Create two more strata outside the test:morphs repository EXTERNAL_STRATA_REPO="$DATADIR/external-strata" mkdir "$EXTERNAL_STRATA_REPO" @@ -88,9 +88,9 @@ create_chunk "$DATADIR/stratum3-hello" "hello" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs me/add-external-strata +"$SRCDIR/scripts/test-morph" branch test:morphs me/add-external-strata -cd "$DATADIR/workspace/me/add-external-strata/baserock:morphs" +cd "$DATADIR/workspace/me/add-external-strata/test:morphs" cat <<EOF > "hello-system.morph" { @@ -102,17 +102,17 @@ cat <<EOF > "hello-system.morph" "strata": [ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", "ref": "master" }, { "morph": "stratum2", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "master" }, { "morph": "stratum3", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "master" } ] @@ -122,8 +122,8 @@ git commit --quiet --all -m "Add two more external strata" # Merge to master cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -cd master/baserock:morphs +"$SRCDIR/scripts/test-morph" checkout test:morphs master +cd master/test:morphs "$SRCDIR/scripts/test-morph" merge me/add-external-strata # In reality the user would do: 'git push origin master' here, @@ -131,6 +131,6 @@ cd master/baserock:morphs # We should consider a separate fixture for the workflow tests. cd "$DATADIR/morphs" git pull -q \ - "file://$DATADIR/workspace/master/baserock:morphs" master + "file://$DATADIR/workspace/master/test:morphs" master cd "$DATADIR/workspace" diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script index 5006c061..ef38c2e6 100755 --- a/tests.as-root/archless-system-fails.script +++ b/tests.as-root/archless-system-fails.script @@ -21,7 +21,7 @@ set -eu cache="$DATADIR/cache/artifacts" -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" cd "$morphsrepo" git checkout --quiet -b archless master @@ -33,7 +33,7 @@ cat <<EOF >archless-system.morph "strata": [ { "morph": "hello-stratum", - "repo": "tests:morphs-repo", + "repo": "tests:morphs", "ref": "archless" } ] @@ -43,4 +43,4 @@ git add archless-system.morph git commit --quiet -m "add archless system" "$SRCDIR/scripts/test-morph" \ - build-morphology test:morphs-repo archless archless-system + build-morphology test:morphs archless archless-system diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script index 56fd08cf..ab84c431 100755 --- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script +++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script @@ -27,26 +27,7 @@ then exit 0 fi -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE - +source "$SRCDIR/tests.as-root/setup-build" # Build once. cd "$DATADIR/workspace" @@ -59,6 +40,6 @@ cd "$DATADIR/workspace/branch1" "$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" # Build thrice, and that should be enough. -cd "$DATADIR/workspace/branch1/test:morphs-repo" +cd "$DATADIR/workspace/branch1/test:morphs" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.stdout b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.stdout index 323e99d3..a02b977c 100644 --- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.stdout +++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.stdout @@ -2,29 +2,29 @@ d . f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.meta f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-kernel -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-rootfs f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.build-log f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.chunk.linux f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-kernel +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-rootfs d . f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.meta f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-kernel -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-rootfs f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.build-log f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.chunk.linux f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-kernel +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-rootfs d . f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.meta f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-kernel -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-rootfs f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.build-log f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.chunk.linux f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-kernel +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-rootfs diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script index 0ba6ebad..f959bb43 100755 --- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script +++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script @@ -27,25 +27,7 @@ then exit 0 fi -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE +source "$SRCDIR/tests.as-root/setup-build" # Build the linux system from the system branch. cd "$DATADIR/workspace" @@ -53,7 +35,7 @@ cd "$DATADIR/workspace" # Print tree SHA1s of the build ref of morphs and kernel. echo "Tree of morphs repo build branch after first build:" -cd "$DATADIR/workspace/branch1/test:morphs-repo" +cd "$DATADIR/workspace/branch1/test:morphs" git log -1 --format=%T baserock/builds/123456789/987654321 echo "Tree of kernel repo build branch after first build:" cd "$DATADIR/workspace/branch1/test:kernel-repo" @@ -70,11 +52,11 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" build linux-system # Print tree SHA1s of the build ref of morphs and kernel again. -# This time the tree SHA1 of morphs-repo should be the same +# This time the tree SHA1 of morphs should be the same # but that of the kernel repo should be different because we # made a change. echo "Tree of morphs repo build branch after second build:" -cd "$DATADIR/workspace/branch1/test:morphs-repo" +cd "$DATADIR/workspace/branch1/test:morphs" git log -1 --format=%T baserock/builds/123456789/987654321 echo "Tree of kernel repo build branch after second build:" cd "$DATADIR/workspace/branch1/test:kernel-repo" diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.stdout b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.stdout index 3cb8aee1..d5758d78 100644 --- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.stdout +++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.stdout @@ -1,9 +1,9 @@ Tree of morphs repo build branch after first build: -101ce7d2f829c44c076c01aef4656ffa3a47e732 +73b00844bfe028b01d2464727d703f1fcc1f8ef9 Tree of kernel repo build branch after first build: 83d99190fa36d14f1bd24d88ba0fbe2ce674dd7c Tree of morphs repo build branch after second build: -101ce7d2f829c44c076c01aef4656ffa3a47e732 +73b00844bfe028b01d2464727d703f1fcc1f8ef9 Tree of kernel repo build branch after second build: 5b015689415c96cdd290834ba105a64be28a3cfb diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script index 462963e0..1ce59b0f 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -26,29 +26,7 @@ then exit 0 fi -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. This is needed -# because the system and stratum morphologies will have references -# to the temporary build refs and that will affect the artifact -# cache keys. If we fix the UUIDs, the artifact cache keys will -# always be the same. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE +source "$SRCDIR/tests.as-root/setup-build" # Build from the workspace root. cd "$DATADIR/workspace" @@ -63,7 +41,7 @@ cd "$DATADIR/workspace/branch1" rm -rf "$DATADIR/cache/artifacts"/* # Build form the branch root repository. -cd "$DATADIR/workspace/branch1/test:morphs-repo" +cd "$DATADIR/workspace/branch1/test:morphs" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output3" rm -rf "$DATADIR/cache/artifacts"/* diff --git a/tests.as-root/building-a-system-branch-works-anywhere.stdout b/tests.as-root/building-a-system-branch-works-anywhere.stdout index 82a95018..3bbb820f 100644 --- a/tests.as-root/building-a-system-branch-works-anywhere.stdout +++ b/tests.as-root/building-a-system-branch-works-anywhere.stdout @@ -2,9 +2,9 @@ d . f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.meta f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum f ./2311765afd12c233a772a33d7f7e31e2450c191379a430790ea03b07938b9e14.stratum.linux-stratum.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.meta -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-kernel -f ./a93235b001f0e456593d6ca4d686c968a66206b8b83dcdf8764f649afe1b0d19.system.linux-system-rootfs f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.build-log f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.chunk.linux f ./e8d3ecb31babcb58516f1298ccc5f63b167186e6527d831af5a788309a648cd6.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.meta +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-kernel +f ./f59cea90b0ea8c780c00adee730f6de993be0b744c7c92fb06b037b7879fc668.system.linux-system-rootfs diff --git a/tests.as-root/building-creates-correct-temporary-refs.script b/tests.as-root/building-creates-correct-temporary-refs.script index c3ee7019..8c6f8807 100755 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ b/tests.as-root/building-creates-correct-temporary-refs.script @@ -19,25 +19,7 @@ set -eu -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE +source "$SRCDIR/tests.as-root/setup-build" # Build the linux system from the system branch. cd "$DATADIR/workspace" @@ -45,7 +27,7 @@ cd "$DATADIR/workspace" # Verify that the right temporary refs were created. echo "Refs of morphs repo after first build:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test:morphs-repo" \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test:morphs" \ show-ref | cut -d' ' -f2 echo "Refs of kernel repo after first build:" "$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test:kernel-repo" \ @@ -58,7 +40,7 @@ cd "$DATADIR/workspace" # Verify that the right temporary refs were created. echo "Refs of morphs repo after second build:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test:morphs-repo" \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test:morphs" \ show-ref | cut -d' ' -f2 echo "Refs of kernel repo after second build:" "$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test:kernel-repo" \ diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script index 0b3207e2..77283840 100755 --- a/tests.as-root/disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/disk-builds-rootfs-and-kernel.script @@ -23,7 +23,7 @@ set -eu cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" arch=$(uname -m) @@ -39,7 +39,7 @@ cat <<EOF >system.morph "strata": [ { "morph": "stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "custom" } ] @@ -86,7 +86,7 @@ git add linux.morph git commit --quiet -m 'Make the kernel create a dummy zImage' rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ - build-morphology test:morphs-repo custom system) + build-morphology test:morphs custom system) for suffix in kernel rootfs do diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index 7f033c20..59b42adf 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -22,7 +22,7 @@ set -eu . "$SRCDIR/tests.as-root/lib" # Make a stratum that include hello and kernel chunks. -cat <<EOF > "$DATADIR/morphs-repo/hello-stratum.morph" +cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" { "name": "hello-stratum", "kind": "stratum", @@ -42,12 +42,12 @@ cat <<EOF > "$DATADIR/morphs-repo/hello-stratum.morph" ] } EOF -"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs-repo" commit --quiet -am foo \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs" commit --quiet -am foo \ > /dev/null # Build first image. Remember the stratum. "$SRCDIR/scripts/test-morph" build-morphology \ - test:morphs-repo master hello-system + test:morphs master hello-system img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs') # Modify the chunk, in a new branch. @@ -59,23 +59,23 @@ sed -i s/hello/goodbye/ "$DATADIR/chunk-repo/hello.c" # Modify the morphs repo to use the new chunk branch, creating a new # branch for the morphs repo. -"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs-repo" checkout --quiet -b alfred -sed -i 's/farrokh/alfred/' "$DATADIR/morphs-repo/hello-stratum.morph" -sed -i 's/master/alfred/' "$DATADIR/morphs-repo/hello-system.morph" -"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs-repo" commit -am goodbye \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs" checkout --quiet -b alfred +sed -i 's/farrokh/alfred/' "$DATADIR/morphs/hello-stratum.morph" +sed -i 's/master/alfred/' "$DATADIR/morphs/hello-system.morph" +"$SRCDIR/scripts/run-git-in" "$DATADIR/morphs" commit -am goodbye \ > /dev/null # Build second image. "$SRCDIR/scripts/test-morph" build-morphology \ - test:morphs-repo alfred hello-system + test:morphs alfred hello-system img2=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*' \ ! -name $(basename "$img1")) # Make the patch. patch="$DATADIR/patch" "$SRCDIR/scripts/test-morph" make-patch "$patch" \ - test:morphs-repo master hello-system.morph \ - test:morphs-repo alfred hello-system.morph + test:morphs master hello-system.morph \ + test:morphs alfred hello-system.morph # Big Scary WARNING: The test from here-on down is disabled # Not because of bugs in Morph but because the images are compressed diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index 99b5b73c..fea92d65 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -26,7 +26,7 @@ esac cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" log="$DATADIR/morph.log" arch=$(uname -m) @@ -43,7 +43,7 @@ cat <<EOF >system.morph "strata": [ { "morph": "stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "custom" } ] @@ -89,7 +89,7 @@ git add linux.morph git commit --quiet -m 'Make the kernel create a dummy zImage' "$SRCDIR/scripts/test-morph" \ - build-morphology test:morphs-repo custom system > /dev/null + build-morphology test:morphs custom system > /dev/null for suffix in kernel rootfs do diff --git a/tests.as-root/setup b/tests.as-root/setup index cb3448a9..b7a273da 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -86,7 +86,7 @@ git checkout --quiet master # Create morph repository. -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" mkdir "$morphsrepo" cd "$morphsrepo" git init --quiet @@ -117,7 +117,7 @@ cat <<EOF > hello-system.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "master" } ] @@ -135,7 +135,7 @@ cat <<EOF > linux-system.morph "strata": [ { "morph": "linux-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "master" } ] diff --git a/tests.as-root/setup-build b/tests.as-root/setup-build new file mode 100644 index 00000000..8d6e6612 --- /dev/null +++ b/tests.as-root/setup-build @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright (C) 2012 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. + +# Fixture for tests involving 'morph build' + +source "$SRCDIR/scripts/fix-committer-info" + +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch test:morphs branch1 +"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux + +# Fix UUID's in the checked out repos to make build branch names deterministic +git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ + branch.uuid 123456789 +git config -f "$DATADIR/workspace/branch1/test:morphs/.git/config" \ + morph.uuid 987654321 +git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ + morph.uuid AABBCCDDE + diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script index ffe6c1cf..463f2a1d 100755 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script @@ -31,7 +31,7 @@ esac cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" log="$DATADIR/morph.log" cd "$morphsrepo" @@ -46,7 +46,7 @@ cat <<EOF >system.morph "strata": [ { "morph": "stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "custom" } ] @@ -94,7 +94,7 @@ git commit --quiet -m 'Make the kernel create a dummy zImage' rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ - build-morphology test:morphs-repo custom system) + build-morphology test:morphs custom system) for suffix in kernel rootfs do diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.script b/tests.as-root/syslinux-fails-if-no-mbr-found.script index ea1d135d..9357cfc9 100755 --- a/tests.as-root/syslinux-fails-if-no-mbr-found.script +++ b/tests.as-root/syslinux-fails-if-no-mbr-found.script @@ -29,7 +29,7 @@ esac cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" log="$DATADIR/morph.log" cd "$morphsrepo" @@ -44,7 +44,7 @@ cat <<EOF >system.morph "strata": [ { "morph": "stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "custom" } ] @@ -91,4 +91,4 @@ git add linux.morph git commit --quiet -m 'Make the kernel create a dummy zImage' "$SRCDIR/scripts/test-morph" --syslinux-mbr-search-path=nosuchfile.bin \ - build-morphology test:morphs-repo custom system > /dev/null + build-morphology test:morphs custom system > /dev/null diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 5e995062..61b89f27 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -22,7 +22,7 @@ set -eu cache="$DATADIR/cache/artifacts" chunkrepo="$DATADIR/chunk-repo" -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" cd "$morphsrepo" git checkout --quiet -b overlap master @@ -36,12 +36,12 @@ cat <<EOF >overlap-system.morph "strata": [ { "morph": "foo-baz-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "overlap" }, { "morph": "foo-barqux-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "overlap" } ] @@ -132,7 +132,7 @@ git add overlap-*.morph git commit --quiet -m 'Add overlapping chunks' "$SRCDIR/scripts/test-morph" \ - build-morphology test:morphs-repo overlap overlap-system > /dev/null + build-morphology test:morphs overlap overlap-system > /dev/null "$SRCDIR/scripts/list-overlaps" groups \ "$cache"/*.system.overlap-system*.overlaps | while IFS='\n' read overlaps; do diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 056cc688..412d27e0 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -27,7 +27,7 @@ esac . "$SRCDIR/scripts/fix-committer-info" tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ - build-morphology test:morphs-repo tarball-links hello-tarball) + build-morphology test:morphs tarball-links hello-tarball) extracted="$DATADIR/extracted" mkdir -p "$extracted" diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup index f9aaed2c..322038ba 100755 --- a/tests.as-root/tarball-image-is-sensible.setup +++ b/tests.as-root/tarball-image-is-sensible.setup @@ -39,7 +39,7 @@ EOF git add links.morph git commit --quiet -m 'Add link adding chunk' -morphsrepo="$DATADIR/morphs-repo" +morphsrepo="$DATADIR/morphs" cd "$morphsrepo" git checkout -b tarball-links cat <<EOF > hello-tarball.morph @@ -51,17 +51,17 @@ cat <<EOF > hello-tarball.morph "strata": [ { "morph": "link-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "tarball-links" }, { "morph": "hello-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "tarball-links" }, { "morph": "linux-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "tarball-links" } ] diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index 92b80d4a..9da776fd 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -37,13 +37,13 @@ git commit --quiet -am "Rename hello-system" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs release +"$SRCDIR/scripts/test-morph" branch test:morphs release # Create an extra ref to confuse any users of git show-ref -cd release/baserock:morphs +cd release/test:morphs git checkout --quiet -b alpha/master HEAD~1 git checkout --quiet release # The petrify will fail if we resolved 'master' as 'alpha/master' by mistake. -cd "$DATADIR/workspace/release/baserock:morphs" +cd "$DATADIR/workspace/release/test:morphs" "$SRCDIR/scripts/test-morph" petrify diff --git a/tests.branching/branch-cleans-up-on-failure.script b/tests.branching/branch-cleans-up-on-failure.script index 4036046c..5e358fb9 100755 --- a/tests.branching/branch-cleans-up-on-failure.script +++ b/tests.branching/branch-cleans-up-on-failure.script @@ -23,6 +23,6 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init # This will fail because we're trying to branch off a ref that doesn't exist -"$SRCDIR/scripts/test-morph" branch baserock:morphs foo/bar invalid-ref || true +"$SRCDIR/scripts/test-morph" branch test:morphs foo/bar invalid-ref || true [ ! -d "$DATADIR/workspace/foo" ] diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script index 716dce8d..2ddc053a 100755 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.script +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script @@ -21,7 +21,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch alfred +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch alfred echo "File tree:" "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | @@ -29,8 +29,8 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch +"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch echo "Current origin:" -"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin | +"$SRCDIR/scripts/run-git-in" newbranch/test:morphs remote show origin | sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index 27e4944a..948c5d19 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -6,12 +6,12 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./newbranch d ./newbranch/.morph-system-branch -d ./newbranch/baserock:morphs -d ./newbranch/baserock:morphs/.git +d ./newbranch/test:morphs +d ./newbranch/test:morphs/.git f ./newbranch/.morph-system-branch/config -f ./newbranch/baserock:morphs/hello-stratum.morph -f ./newbranch/baserock:morphs/hello-system.morph -f ./newbranch/baserock:morphs/this.is.alfred +f ./newbranch/test:morphs/hello-stratum.morph +f ./newbranch/test:morphs/hello-system.morph +f ./newbranch/test:morphs/this.is.alfred Current branches: alfred * newbranch diff --git a/tests.branching/branch-creates-new-system-branch.script b/tests.branching/branch-creates-new-system-branch.script index 86990824..35b50f7c 100755 --- a/tests.branching/branch-creates-new-system-branch.script +++ b/tests.branching/branch-creates-new-system-branch.script @@ -21,7 +21,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch echo "File tree:" "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | @@ -29,8 +29,8 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch +"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch echo "Current origin:" -"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin | +"$SRCDIR/scripts/run-git-in" newbranch/test:morphs remote show origin | sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout index 5a4bd1d2..bc4bf568 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -6,11 +6,11 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./newbranch d ./newbranch/.morph-system-branch -d ./newbranch/baserock:morphs -d ./newbranch/baserock:morphs/.git +d ./newbranch/test:morphs +d ./newbranch/test:morphs/.git f ./newbranch/.morph-system-branch/config -f ./newbranch/baserock:morphs/hello-stratum.morph -f ./newbranch/baserock:morphs/hello-system.morph +f ./newbranch/test:morphs/hello-stratum.morph +f ./newbranch/test:morphs/hello-system.morph Current branches: master * newbranch diff --git a/tests.branching/branch-fails-if-branch-exists.script b/tests.branching/branch-fails-if-branch-exists.script index c9a18633..1ae92d30 100755 --- a/tests.branching/branch-fails-if-branch-exists.script +++ b/tests.branching/branch-fails-if-branch-exists.script @@ -28,11 +28,11 @@ cd "$DATADIR/workspace" # We create a valid branch inside the same prefix first so we can check it # doesn't get caught up in the deletion of the invalid branch directory -"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/new-branch +"$SRCDIR/scripts/test-morph" branch test:morphs baserock/new-branch [ -d "$DATADIR/workspace/baserock/new-branch" ] -"$SRCDIR/scripts/test-morph" branch baserock:morphs \ +"$SRCDIR/scripts/test-morph" branch test:morphs \ baserock/existing-branch || true [ -d "$DATADIR/workspace/baserock/new-branch" ] diff --git a/tests.branching/branch-fails-if-branch-exists.stderr b/tests.branching/branch-fails-if-branch-exists.stderr index c2ae2d9e..5b4bc943 100644 --- a/tests.branching/branch-fails-if-branch-exists.stderr +++ b/tests.branching/branch-fails-if-branch-exists.stderr @@ -1 +1 @@ -ERROR: branch baserock/existing-branch already exists in repository baserock:morphs +ERROR: branch baserock/existing-branch already exists in repository test:morphs diff --git a/tests.branching/branch-when-branchdir-exists-locally.script b/tests.branching/branch-when-branchdir-exists-locally.script index a98f6401..318f1b37 100755 --- a/tests.branching/branch-when-branchdir-exists-locally.script +++ b/tests.branching/branch-when-branchdir-exists-locally.script @@ -23,5 +23,5 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init mkdir newbranch -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch diff --git a/tests.branching/branch-works-anywhere.script b/tests.branching/branch-works-anywhere.script index 19a00024..5198d7f4 100755 --- a/tests.branching/branch-works-anywhere.script +++ b/tests.branching/branch-works-anywhere.script @@ -22,7 +22,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init # First, create a branch. -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch1 +"$SRCDIR/scripts/test-morph" branch test:morphs branch1 echo "Workspace after creating the first branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -30,7 +30,7 @@ echo "Workspace after creating the first branch:" grep -v 'cache/gits/file_[^/]*/' # Now, create a nother branch from the workspace. -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch2 +"$SRCDIR/scripts/test-morph" branch test:morphs branch2 echo "Workspace after creating the second branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -41,7 +41,7 @@ echo "Workspace after creating the second branch:" # should not be created in the working directory but in the # workspace directory. cd "$DATADIR/workspace/branch1" -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch3 +"$SRCDIR/scripts/test-morph" branch test:morphs branch3 echo "Workspace after creating the third branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -51,8 +51,8 @@ echo "Workspace after creating the third branch:" # Now, go into the morphs repository of that third branch and # create a fourth system branch from in there. This, too, should # end up being created in the toplevel workspace directory. -cd "$DATADIR/workspace/branch3/baserock:morphs" -"$SRCDIR/scripts/test-morph" branch baserock:morphs branch4 +cd "$DATADIR/workspace/branch3/test:morphs" +"$SRCDIR/scripts/test-morph" branch test:morphs branch4 echo "Workspace after creating the fourth branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index 484fee45..3470a804 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -6,11 +6,11 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph Workspace after creating the second branch: d . d ./.morph @@ -19,18 +19,18 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/baserock:morphs -d ./branch2/baserock:morphs/.git +d ./branch2/test:morphs +d ./branch2/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph f ./branch2/.morph-system-branch/config -f ./branch2/baserock:morphs/hello-stratum.morph -f ./branch2/baserock:morphs/hello-system.morph +f ./branch2/test:morphs/hello-stratum.morph +f ./branch2/test:morphs/hello-system.morph Workspace after creating the third branch: d . d ./.morph @@ -39,25 +39,25 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/baserock:morphs -d ./branch2/baserock:morphs/.git +d ./branch2/test:morphs +d ./branch2/test:morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/baserock:morphs -d ./branch3/baserock:morphs/.git +d ./branch3/test:morphs +d ./branch3/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph f ./branch2/.morph-system-branch/config -f ./branch2/baserock:morphs/hello-stratum.morph -f ./branch2/baserock:morphs/hello-system.morph +f ./branch2/test:morphs/hello-stratum.morph +f ./branch2/test:morphs/hello-system.morph f ./branch3/.morph-system-branch/config -f ./branch3/baserock:morphs/hello-stratum.morph -f ./branch3/baserock:morphs/hello-system.morph +f ./branch3/test:morphs/hello-stratum.morph +f ./branch3/test:morphs/hello-system.morph Workspace after creating the fourth branch: d . d ./.morph @@ -66,29 +66,29 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/baserock:morphs -d ./branch1/baserock:morphs/.git +d ./branch1/test:morphs +d ./branch1/test:morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/baserock:morphs -d ./branch2/baserock:morphs/.git +d ./branch2/test:morphs +d ./branch2/test:morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/baserock:morphs -d ./branch3/baserock:morphs/.git +d ./branch3/test:morphs +d ./branch3/test:morphs/.git d ./branch4 d ./branch4/.morph-system-branch -d ./branch4/baserock:morphs -d ./branch4/baserock:morphs/.git +d ./branch4/test:morphs +d ./branch4/test:morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/baserock:morphs/hello-stratum.morph -f ./branch1/baserock:morphs/hello-system.morph +f ./branch1/test:morphs/hello-stratum.morph +f ./branch1/test:morphs/hello-system.morph f ./branch2/.morph-system-branch/config -f ./branch2/baserock:morphs/hello-stratum.morph -f ./branch2/baserock:morphs/hello-system.morph +f ./branch2/test:morphs/hello-stratum.morph +f ./branch2/test:morphs/hello-system.morph f ./branch3/.morph-system-branch/config -f ./branch3/baserock:morphs/hello-stratum.morph -f ./branch3/baserock:morphs/hello-system.morph +f ./branch3/test:morphs/hello-stratum.morph +f ./branch3/test:morphs/hello-system.morph f ./branch4/.morph-system-branch/config -f ./branch4/baserock:morphs/hello-stratum.morph -f ./branch4/baserock:morphs/hello-system.morph +f ./branch4/test:morphs/hello-stratum.morph +f ./branch4/test:morphs/hello-system.morph diff --git a/tests.branching/checkout-cleans-up-on-failure.script b/tests.branching/checkout-cleans-up-on-failure.script index b2a59e6c..fe80770f 100755 --- a/tests.branching/checkout-cleans-up-on-failure.script +++ b/tests.branching/checkout-cleans-up-on-failure.script @@ -22,6 +22,6 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs i/do/not/exist || true +"$SRCDIR/scripts/test-morph" checkout test:morphs i/do/not/exist || true [ ! -d "$DATADIR/workspace/i" ] diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script index 0edf0222..310b9f42 100755 --- a/tests.branching/checkout-existing-branch.script +++ b/tests.branching/checkout-existing-branch.script @@ -15,7 +15,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Verify that "morph checkout baserock:morphs master" works. +# Verify that "morph checkout test:morphs master" works. set -eu @@ -23,7 +23,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "File tree:" "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | @@ -31,4 +31,4 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" master/baserock:morphs branch +"$SRCDIR/scripts/run-git-in" master/test:morphs branch diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 30f48b68..60fca613 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -6,10 +6,10 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch -d ./master/baserock:morphs -d ./master/baserock:morphs/.git +d ./master/test:morphs +d ./master/test:morphs/.git f ./master/.morph-system-branch/config -f ./master/baserock:morphs/hello-stratum.morph -f ./master/baserock:morphs/hello-system.morph +f ./master/test:morphs/hello-stratum.morph +f ./master/test:morphs/hello-system.morph Current branches: * master diff --git a/tests.branching/checkout-works-anywhere.script b/tests.branching/checkout-works-anywhere.script index 73e30498..c7d046e4 100755 --- a/tests.branching/checkout-works-anywhere.script +++ b/tests.branching/checkout-works-anywhere.script @@ -22,7 +22,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init # First, check out the master branch from the workspace directory. -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "Workspace after checking out master from the workspace directory:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | @@ -38,9 +38,9 @@ cd workspace # This time, create a new branch and check out the master branch # from within that branch. -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch -cd newbranch/baserock:morphs -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch +cd newbranch/test:morphs +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "Workspace after checking out master from within a new branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout index e8171473..6e82072a 100644 --- a/tests.branching/checkout-works-anywhere.stdout +++ b/tests.branching/checkout-works-anywhere.stdout @@ -6,11 +6,11 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch -d ./master/baserock:morphs -d ./master/baserock:morphs/.git +d ./master/test:morphs +d ./master/test:morphs/.git f ./master/.morph-system-branch/config -f ./master/baserock:morphs/hello-stratum.morph -f ./master/baserock:morphs/hello-system.morph +f ./master/test:morphs/hello-stratum.morph +f ./master/test:morphs/hello-system.morph Workspace after checking out master from within a new branch: d . d ./.morph @@ -19,15 +19,15 @@ d ./.morph/cache/gits d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch -d ./master/baserock:morphs -d ./master/baserock:morphs/.git +d ./master/test:morphs +d ./master/test:morphs/.git d ./newbranch d ./newbranch/.morph-system-branch -d ./newbranch/baserock:morphs -d ./newbranch/baserock:morphs/.git +d ./newbranch/test:morphs +d ./newbranch/test:morphs/.git f ./master/.morph-system-branch/config -f ./master/baserock:morphs/hello-stratum.morph -f ./master/baserock:morphs/hello-system.morph +f ./master/test:morphs/hello-stratum.morph +f ./master/test:morphs/hello-system.morph f ./newbranch/.morph-system-branch/config -f ./newbranch/baserock:morphs/hello-stratum.morph -f ./newbranch/baserock:morphs/hello-system.morph +f ./newbranch/test:morphs/hello-stratum.morph +f ./newbranch/test:morphs/hello-system.morph diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 5e0d7bc9..814b128f 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -23,7 +23,7 @@ set -eu # Checkout the master system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs alfred +"$SRCDIR/scripts/test-morph" checkout test:morphs alfred # Edit the hello chunk in alfred. cd "alfred" @@ -34,4 +34,4 @@ echo "Current branches:" echo echo "Files in hello:" -ls "$DATADIR/workspace/alfred/baserock:hello" +ls "$DATADIR/workspace/alfred/test:hello" diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index 77f8fcd7..acfd1c0a 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -1,8 +1,8 @@ Current branches: -baserock:morphs +test:morphs * alfred -baserock:hello +test:hello * alfred master diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index aef40807..27440816 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -23,7 +23,7 @@ set -eu # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout index ea7133f5..b694233b 100644 --- a/tests.branching/edit-clones-chunk.stdout +++ b/tests.branching/edit-clones-chunk.stdout @@ -1,14 +1,14 @@ Current branches: -baserock:morphs +test:morphs master * newbranch -baserock:hello +test:hello master * newbranch Current origins: -baserock:morphs +test:morphs * remote origin Fetch URL: file://TMP/morphs Push URL: file://TMP/morphs @@ -21,7 +21,7 @@ baserock:morphs Local ref configured for 'git push': master pushes to master (up to date) -baserock:hello +test:hello * remote origin Fetch URL: file://TMP/hello Push URL: file://TMP/hello diff --git a/tests.branching/edit-handles-submodules.script b/tests.branching/edit-handles-submodules.script index 6e781cbe..bbe86c1f 100755 --- a/tests.branching/edit-handles-submodules.script +++ b/tests.branching/edit-handles-submodules.script @@ -21,11 +21,11 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Submodules should be set up automatically "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd "$DATADIR/workspace/newbranch/baserock:hello" +cd "$DATADIR/workspace/newbranch/test:hello" [ -e foolib/README ] diff --git a/tests.branching/edit-handles-submodules.setup b/tests.branching/edit-handles-submodules.setup index 1b3f3198..cb61ad66 100755 --- a/tests.branching/edit-handles-submodules.setup +++ b/tests.branching/edit-handles-submodules.setup @@ -34,7 +34,7 @@ git commit -m "Use Foolib submodule" cat <<EOF > "$DATADIR/hello/.gitmodules" [submodule "foolib"] path = foolib - url = baserock:foolib + url = test:foolib EOF git add .gitmodules -git commit -m "Use Foolib from baserock: prefix" +git commit -m "Use Foolib from test: prefix" diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index f95526e2..d43fd360 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -30,10 +30,10 @@ fi # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello # See what effect the editing had. -"$SRCDIR/scripts/run-git-in" "newbranch/baserock:morphs" diff +"$SRCDIR/scripts/run-git-in" "newbranch/test:morphs" diff diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 260ac9a6..1e239196 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,24 +1,24 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 006a96c..68fcbff 100644 +index 3b7be17..febfa60 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph @@ -5,7 +5,7 @@ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", - "ref": "master", + "ref": "newbranch", "build-depends": [] } ] diff --git a/hello-system.morph b/hello-system.morph -index 1a33ed6..9cca1bf 100644 +index f3f64b4..99516e3 100644 --- a/hello-system.morph +++ b/hello-system.morph @@ -8,7 +8,7 @@ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", - "ref": "master" + "ref": "newbranch" } diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script index 5b1f5137..f62dd73e 100755 --- a/tests.branching/edit-uses-ref-from-stratum.script +++ b/tests.branching/edit-uses-ref-from-stratum.script @@ -23,9 +23,9 @@ set -eu # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch # Edit chunk. "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -"$SRCDIR/scripts/run-git-in" "newbranch/baserock:hello" branch +"$SRCDIR/scripts/run-git-in" "newbranch/test:hello" branch diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.script b/tests.branching/edit-works-after-branch-root-was-renamed.script index 2f0d1588..b6eaa729 100755 --- a/tests.branching/edit-works-after-branch-root-was-renamed.script +++ b/tests.branching/edit-works-after-branch-root-was-renamed.script @@ -23,10 +23,10 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd "$DATADIR/workspace/master" -mv baserock:morphs my-renamed-morphs +mv test:morphs my-renamed-morphs "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.stdout b/tests.branching/edit-works-after-branch-root-was-renamed.stdout index b544d08a..549c1c34 100644 --- a/tests.branching/edit-works-after-branch-root-was-renamed.stdout +++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout @@ -6,11 +6,11 @@ d ./.morph/cache/gits/file_hello d ./.morph/cache/gits/file_morphs d ./master d ./master/.morph-system-branch -d ./master/baserock:hello -d ./master/baserock:hello/.git d ./master/my-renamed-morphs d ./master/my-renamed-morphs/.git +d ./master/test:hello +d ./master/test:hello/.git f ./master/.morph-system-branch/config -f ./master/baserock:hello/hello.morph f ./master/my-renamed-morphs/hello-stratum.morph f ./master/my-renamed-morphs/hello-system.morph +f ./master/test:hello/hello.morph diff --git a/tests.branching/foreach-handles-command-failure.script b/tests.branching/foreach-handles-command-failure.script index 25b96cf6..00d27659 100755 --- a/tests.branching/foreach-handles-command-failure.script +++ b/tests.branching/foreach-handles-command-failure.script @@ -22,7 +22,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello "$SRCDIR/scripts/test-morph" foreach git remote update non-existant-remote diff --git a/tests.branching/foreach-handles-command-failure.stderr b/tests.branching/foreach-handles-command-failure.stderr index 72942b89..c3085343 100644 --- a/tests.branching/foreach-handles-command-failure.stderr +++ b/tests.branching/foreach-handles-command-failure.stderr @@ -1 +1 @@ -ERROR: Command failed at repo baserock:morphs: git remote update non-existant-remote +ERROR: Command failed at repo test:morphs: git remote update non-existant-remote diff --git a/tests.branching/foreach-handles-command-failure.stdout b/tests.branching/foreach-handles-command-failure.stdout index 2db791fc..6bb791b3 100644 --- a/tests.branching/foreach-handles-command-failure.stdout +++ b/tests.branching/foreach-handles-command-failure.stdout @@ -1,2 +1,2 @@ -baserock:morphs +test:morphs fatal: No such remote or remote group: non-existant-remote diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script index 5f5efa9e..68edbad6 100755 --- a/tests.branching/morph-repository-stored-in-cloned-repositories.script +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script @@ -24,18 +24,18 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch echo "morph.repository in branch root repository:" -cd "$DATADIR/workspace/newbranch/baserock:morphs" +cd "$DATADIR/workspace/newbranch/test:morphs" git config morph.repository echo cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "morph.repository in branch root repository of a checkout:" -cd "$DATADIR/workspace/master/baserock:morphs" +cd "$DATADIR/workspace/master/test:morphs" git config morph.repository echo @@ -43,5 +43,5 @@ cd "$DATADIR/workspace/master" "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello echo "morph.repository of an edited repository:" -cd "$DATADIR/workspace/master/baserock:hello" +cd "$DATADIR/workspace/master/test:hello" git config morph.repository diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.stdout b/tests.branching/morph-repository-stored-in-cloned-repositories.stdout index b57f0c1f..eadcdd19 100644 --- a/tests.branching/morph-repository-stored-in-cloned-repositories.stdout +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.stdout @@ -1,8 +1,8 @@ morph.repository in branch root repository: -baserock:morphs +test:morphs morph.repository in branch root repository of a checkout: -baserock:morphs +test:morphs morph.repository of an edited repository: -baserock:hello +test:hello diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script index 9fc00d39..56326cdc 100755 --- a/tests.branching/petrify-no-double-petrify.script +++ b/tests.branching/petrify-no-double-petrify.script @@ -31,9 +31,9 @@ fi cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify +"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify -cd test/petrify/baserock:morphs +cd test/petrify/test:morphs "$SRCDIR/scripts/test-morph" petrify "$SRCDIR/scripts/test-morph" petrify "$SRCDIR/scripts/test-morph" petrify diff --git a/tests.branching/petrify-no-double-petrify.stdout b/tests.branching/petrify-no-double-petrify.stdout index 4aa2b2ea..87561c14 100644 --- a/tests.branching/petrify-no-double-petrify.stdout +++ b/tests.branching/petrify-no-double-petrify.stdout @@ -4,7 +4,7 @@ "chunks": [ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", "build-depends": [], "unpetrify-ref": "master" diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index c1828bf3..a74ae6ba 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -33,9 +33,9 @@ fi cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify master +"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify master -cd test/petrify/baserock:morphs +cd test/petrify/test:morphs "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye "$SRCDIR/scripts/test-morph" petrify diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout index 6219c84e..d2126831 100644 --- a/tests.branching/petrify.stdout +++ b/tests.branching/petrify.stdout @@ -5,14 +5,14 @@ Petrified: "chunks": [ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", "build-depends": [], "unpetrify-ref": "master" }, { "name": "goodbye", - "repo": "baserock:goodbye", + "repo": "test:goodbye", "ref": "test/petrify", "build-depends": [] } @@ -26,13 +26,13 @@ Unpetrified: "chunks": [ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", "ref": "master", "build-depends": [] }, { "name": "goodbye", - "repo": "baserock:goodbye", + "repo": "test:goodbye", "ref": "test/petrify", "build-depends": [] } diff --git a/tests.branching/setup b/tests.branching/setup index f075e7b1..c0dfd969 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -29,7 +29,7 @@ source "$SRCDIR/scripts/fix-committer-info" # Create a morph configuration file cat <<EOF > "$DATADIR/morph.conf" [config] -repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s +repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s cachedir = $DATADIR/workspace/.morph/cache log = $DATADIR/morph.log keep-path = true @@ -58,7 +58,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" "strata": [ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", "ref": "master" } ] @@ -72,7 +72,7 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" "chunks": [ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", "ref": "master", "build-depends": [] } diff --git a/tests.branching/setup-second-chunk b/tests.branching/setup-second-chunk index 9f7aa419..0bbb0e27 100755 --- a/tests.branching/setup-second-chunk +++ b/tests.branching/setup-second-chunk @@ -50,13 +50,13 @@ cat <<EOF > hello-stratum.morph "chunks": [ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", "ref": "master", "build-depends": [] }, { "name": "goodbye", - "repo": "baserock:goodbye", + "repo": "test:goodbye", "ref": "master", "build-depends": [] } diff --git a/tests.branching/show-branch-root-in-branched-branch.script b/tests.branching/show-branch-root-in-branched-branch.script index aeb06bfc..c1798d78 100755 --- a/tests.branching/show-branch-root-in-branched-branch.script +++ b/tests.branching/show-branch-root-in-branched-branch.script @@ -24,7 +24,7 @@ set -eu # Create a workspace and branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs testbranch +"$SRCDIR/scripts/test-morph" branch test:morphs testbranch # Try to print the branch root repository. "$SRCDIR/scripts/test-morph" show-branch-root diff --git a/tests.branching/show-branch-root-in-branched-branch.stdout b/tests.branching/show-branch-root-in-branched-branch.stdout index 53a8bc43..b2804d56 100644 --- a/tests.branching/show-branch-root-in-branched-branch.stdout +++ b/tests.branching/show-branch-root-in-branched-branch.stdout @@ -1 +1 @@ -baserock:morphs +test:morphs diff --git a/tests.branching/show-branch-root-in-checked-out-branch.script b/tests.branching/show-branch-root-in-checked-out-branch.script index ce76cc7b..dfc08edb 100755 --- a/tests.branching/show-branch-root-in-checked-out-branch.script +++ b/tests.branching/show-branch-root-in-checked-out-branch.script @@ -24,7 +24,7 @@ set -eu # Create a workspace and branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master # Try to print the branch root repository. "$SRCDIR/scripts/test-morph" show-branch-root diff --git a/tests.branching/show-branch-root-in-checked-out-branch.stdout b/tests.branching/show-branch-root-in-checked-out-branch.stdout index 53a8bc43..b2804d56 100644 --- a/tests.branching/show-branch-root-in-checked-out-branch.stdout +++ b/tests.branching/show-branch-root-in-checked-out-branch.stdout @@ -1 +1 @@ -baserock:morphs +test:morphs diff --git a/tests.branching/show-system-branch-fails-outside-workspace.script b/tests.branching/show-system-branch-fails-outside-workspace.script index 5cd3bb98..228e03d9 100755 --- a/tests.branching/show-system-branch-fails-outside-workspace.script +++ b/tests.branching/show-system-branch-fails-outside-workspace.script @@ -24,7 +24,7 @@ set -eu # Create a workspace and branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs testbranch +"$SRCDIR/scripts/test-morph" branch test:morphs testbranch # Leave the workspace. cd .. diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script index 2383deb9..58143526 100755 --- a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script +++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script @@ -24,8 +24,8 @@ set -eu # Create a workspace and two system branches cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch -"$SRCDIR/scripts/test-morph" branch baserock:morphs second/branch +"$SRCDIR/scripts/test-morph" branch test:morphs first/branch +"$SRCDIR/scripts/test-morph" branch test:morphs second/branch # Try to find out the branch from the workspace directory. cd "$DATADIR/workspace" diff --git a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script index eb565b91..1b4af8bd 100755 --- a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script +++ b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script @@ -24,7 +24,7 @@ set -eu # Create a workspace and a system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch +"$SRCDIR/scripts/test-morph" branch test:morphs first/branch # Show the branch even when outside the branch. cd "$DATADIR/workspace" diff --git a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script index f4abc8ea..c19e4093 100755 --- a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script +++ b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script @@ -24,8 +24,8 @@ set -eu # Create a workspace and two system branches. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch -"$SRCDIR/scripts/test-morph" branch baserock:morphs second/branch +"$SRCDIR/scripts/test-morph" branch test:morphs first/branch +"$SRCDIR/scripts/test-morph" branch test:morphs second/branch # Create a few subdirectories in the first branch. mkdir -p "$DATADIR/workspace/first/branch/foo" diff --git a/tests.branching/status-in-clean-branch.script b/tests.branching/status-in-clean-branch.script index c102d287..ec496128 100755 --- a/tests.branching/status-in-clean-branch.script +++ b/tests.branching/status-in-clean-branch.script @@ -21,6 +21,6 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init . -"$SRCDIR/scripts/test-morph" branch baserock:morphs test +"$SRCDIR/scripts/test-morph" branch test:morphs test "$SRCDIR/scripts/test-morph" status diff --git a/tests.branching/status-in-clean-branch.stdout b/tests.branching/status-in-clean-branch.stdout index d8468519..684ab9c9 100644 --- a/tests.branching/status-in-clean-branch.stdout +++ b/tests.branching/status-in-clean-branch.stdout @@ -1,3 +1,3 @@ -On branch test, root baserock:morphs +On branch test, root test:morphs No repos have outstanding changes. diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script index beb58ced..18aaf61e 100755 --- a/tests.branching/status-in-dirty-branch.script +++ b/tests.branching/status-in-dirty-branch.script @@ -22,13 +22,13 @@ set -eu . "$SRCDIR/scripts/setup-3rd-party-strata" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch baserock:morphs test +"$SRCDIR/scripts/test-morph" branch test:morphs branch1 # Make the branch have some interesting changes and pitfalls -cd test +cd branch1 "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -cd baserock:stratum2-hello +cd test:stratum2-hello git checkout -q master cd .. diff --git a/tests.branching/status-in-dirty-branch.stdout b/tests.branching/status-in-dirty-branch.stdout index a81aa765..bee47eaa 100644 --- a/tests.branching/status-in-dirty-branch.stdout +++ b/tests.branching/status-in-dirty-branch.stdout @@ -1,5 +1,5 @@ -On branch test, root baserock:morphs - baserock:morphs: uncommitted changes - baserock:external-strata: uncommitted changes - baserock:stratum2-hello: unexpected ref checked out "master" - TMP/workspace/test/red-herring: not part of system branch +On branch branch1, root test:morphs + test:morphs: uncommitted changes + TMP/workspace/branch1/red-herring: not part of system branch + test:external-strata: uncommitted changes + test:stratum2-hello: unexpected ref checked out "master" diff --git a/tests.branching/status-in-workspace.script b/tests.branching/status-in-workspace.script index 5e13b433..63014aee 100755 --- a/tests.branching/status-in-workspace.script +++ b/tests.branching/status-in-workspace.script @@ -21,9 +21,9 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init . -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -"$SRCDIR/scripts/test-morph" branch baserock:morphs a/b/c/d/e/foo -"$SRCDIR/scripts/test-morph" branch baserock:morphs a/b/c/d/e/bar +"$SRCDIR/scripts/test-morph" checkout test:morphs master +"$SRCDIR/scripts/test-morph" branch test:morphs a/b/c/d/e/foo +"$SRCDIR/scripts/test-morph" branch test:morphs a/b/c/d/e/bar mkdir a/b/c/red-herring "$SRCDIR/scripts/test-morph" status diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script index ac8b233e..a73e17db 100755 --- a/tests.branching/workflow-petrify.script +++ b/tests.branching/workflow-petrify.script @@ -31,44 +31,44 @@ fi . "$SRCDIR/scripts/setup-3rd-party-strata" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify +"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify cd test/petrify "$SRCDIR/scripts/test-morph" petrify echo "test/petrify after petrifying:" -cat baserock:morphs/hello-system.morph -cat baserock:external-strata/stratum2.morph -cat baserock:external-strata/stratum3.morph +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello echo echo "test/petrify after editing a chunk:" -cat baserock:morphs/hello-system.morph -cat baserock:external-strata/stratum2.morph -cat baserock:external-strata/stratum3.morph +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph -# me/readme-fixes in baserock:stratum2-hello should be 'master', but +# 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 baserock:morphs +cd test:morphs git commit --quiet --all -m "Petrify branch test/petrify" git push --quiet origin test/petrify -cd ../baserock:external-strata +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 baserock:morphs test/unpetrify test/petrify +"$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 baserock:morphs/hello-system.morph -cat baserock:external-strata/stratum2.morph -cat baserock:external-strata/stratum3.morph +cat test:morphs/hello-system.morph +cat test:external-strata/stratum2.morph +cat test:external-strata/stratum3.morph diff --git a/tests.branching/workflow-petrify.stdout b/tests.branching/workflow-petrify.stdout index 2c50db9c..b572ed67 100644 --- a/tests.branching/workflow-petrify.stdout +++ b/tests.branching/workflow-petrify.stdout @@ -8,17 +8,17 @@ test/petrify after petrifying: "strata": [ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", "ref": "test/petrify" }, { "morph": "stratum2", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "test/petrify" }, { "morph": "stratum3", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "test/petrify" } ] @@ -29,7 +29,7 @@ test/petrify after petrifying: "chunks": [ { "name": "hello", - "repo": "baserock:stratum2-hello", + "repo": "test:stratum2-hello", "ref": "f4730636e429149bb923fa16be3aa9802d484b23", "build-depends": [], "unpetrify-ref": "master" @@ -42,7 +42,7 @@ test/petrify after petrifying: "chunks": [ { "name": "hello", - "repo": "baserock:stratum3-hello", + "repo": "test:stratum3-hello", "ref": "f4730636e429149bb923fa16be3aa9802d484b23", "build-depends": [], "unpetrify-ref": "master" @@ -60,17 +60,17 @@ test/petrify after editing a chunk: "strata": [ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", "ref": "test/petrify" }, { "morph": "stratum2", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "test/petrify" }, { "morph": "stratum3", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "test/petrify" } ] @@ -81,7 +81,7 @@ test/petrify after editing a chunk: "chunks": [ { "name": "hello", - "repo": "baserock:stratum2-hello", + "repo": "test:stratum2-hello", "ref": "test/petrify", "build-depends": [] } @@ -93,7 +93,7 @@ test/petrify after editing a chunk: "chunks": [ { "name": "hello", - "repo": "baserock:stratum3-hello", + "repo": "test:stratum3-hello", "ref": "f4730636e429149bb923fa16be3aa9802d484b23", "build-depends": [], "unpetrify-ref": "master" @@ -111,17 +111,17 @@ test/unpetrify after unpetrifying: "strata": [ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", "ref": "test/unpetrify" }, { "morph": "stratum2", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "test/unpetrify" }, { "morph": "stratum3", - "repo": "baserock:external-strata", + "repo": "test:external-strata", "ref": "test/unpetrify" } ] @@ -132,7 +132,7 @@ test/unpetrify after unpetrifying: "chunks": [ { "name": "hello", - "repo": "baserock:stratum2-hello", + "repo": "test:stratum2-hello", "ref": "test/petrify", "build-depends": [] } @@ -144,7 +144,7 @@ test/unpetrify after unpetrifying: "chunks": [ { "name": "hello", - "repo": "baserock:stratum3-hello", + "repo": "test:stratum3-hello", "ref": "master", "build-depends": [] } 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) ] diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 68da4f4a..56415ce4 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -23,17 +23,17 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fix +"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd me/readme-fix/baserock:hello +cd me/readme-fix/test:hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet -cd ../baserock:morphs +cd ../test:morphs git commit --quiet --all -m "Commit changes for system branch" cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master "$SRCDIR/scripts/test-morph" merge me/readme-fix diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 741e8a3f..6b063a20 100755 --- a/tests.merging/basic.script +++ b/tests.merging/basic.script @@ -29,17 +29,17 @@ 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 cd "$DATADIR/workspace/test/feature" # Edit hello in FROM "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd baserock:hello +cd test:hello touch newfile.txt git add newfile.txt git commit -m foo --quiet @@ -47,7 +47,7 @@ git commit -m foo --quiet # Commit in morphs repo # FIXME: this should become unnecessary since only the refs have # changed. -cd ../baserock:morphs +cd ../test:morphs git commit --all --quiet -m "Update morph refs for test/feature" # Merge changes back to test/stable @@ -57,7 +57,7 @@ cd test/stable # Check results: changes to 'hello' should have been merged back to # test/stable. -cd baserock:hello +cd test:hello [ -e newfile.txt ] # Make sure all changes are committed and to the correct branch ('hello' @@ -67,7 +67,7 @@ git status --short [ $(git rev-parse master) = $(git rev-parse HEAD) ] # Changes here should be on test/stable. -cd ../baserock:morphs +cd ../test:morphs git status --short [ $(git rev-parse test/stable) = $(git rev-parse HEAD) ] @@ -76,11 +76,11 @@ git status --short # The only change here was the branch refs, which have now been # changed back - so there should not be any new commits. -echo "Commit message for baserock:morphs" +echo "Commit message for test:morphs" git cat-file commit HEAD | tail -n 1 echo -echo "Commit message for baserock:hello" -cd ../baserock:hello +echo "Commit message for test:hello" +cd ../test:hello git cat-file commit HEAD | tail -n 1 diff --git a/tests.merging/basic.stdout b/tests.merging/basic.stdout index 2bdde644..7acb135c 100644 --- a/tests.merging/basic.stdout +++ b/tests.merging/basic.stdout @@ -1,5 +1,5 @@ -Commit message for baserock:morphs +Commit message for test:morphs initial -Commit message for baserock:hello +Commit message for test:hello Merge system branch 'test/feature' diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index 3c5ecb04..a9b85989 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.script @@ -30,12 +30,12 @@ fi . "$SRCDIR/scripts/setup-3rd-party-strata" # 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 add_text_in_repo() { REPO="$1" @@ -52,24 +52,24 @@ add_text_in_repo() { cd "$DATADIR/workspace/test/stable" "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello "$SRCDIR/scripts/test-morph" edit hello-system stratum3 hello -add_text_in_repo "baserock:stratum2-hello" "xyzzy" -add_text_in_repo "baserock:stratum3-hello" "xyzzy" +add_text_in_repo "test:stratum2-hello" "xyzzy" +add_text_in_repo "test:stratum3-hello" "xyzzy" cd "$DATADIR/workspace/test/feature" "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello "$SRCDIR/scripts/test-morph" edit hello-system stratum3 hello -add_text_in_repo "baserock:stratum2-hello" "plugh" -add_text_in_repo "baserock:stratum3-hello" "plover" +add_text_in_repo "test:stratum2-hello" "plugh" +add_text_in_repo "test:stratum3-hello" "plover" # This should not be necessary, one day -cd "$DATADIR/workspace/test/stable/baserock:morphs" +cd "$DATADIR/workspace/test/stable/test:morphs" git commit --quiet --all --message "Commit refs for branch" -cd "$DATADIR/workspace/test/stable/baserock:external-strata" +cd "$DATADIR/workspace/test/stable/test:external-strata" git commit --quiet --all --message "Commit refs for branch" -cd "$DATADIR/workspace/test/feature/baserock:morphs" +cd "$DATADIR/workspace/test/feature/test:morphs" git commit --quiet --all --message "Commit refs for branch" -cd "$DATADIR/workspace/test/feature/baserock:external-strata" +cd "$DATADIR/workspace/test/feature/test:external-strata" git commit --quiet --all --message "Commit refs for branch" # Merge changes from test/feature to test/stable @@ -77,8 +77,8 @@ cd "$DATADIR/workspace/test/stable" "$SRCDIR/scripts/test-morph" merge test/feature || true # Check that the repos are all clean -for repo in "baserock:morphs" "baserock:external-strata" \ - "baserock:stratum2-hello" "baserock:stratum3-hello"; do +for repo in "test:morphs" "test:external-strata" \ + "test:stratum2-hello" "test:stratum3-hello"; do cd "$DATADIR/workspace/test/stable/$repo" git status --porcelain [ $(git rev-parse HEAD) = $(git rev-parse test/stable) ] diff --git a/tests.merging/conflict-chunks.stdout b/tests.merging/conflict-chunks.stdout index bf6d3828..01ae550f 100644 --- a/tests.merging/conflict-chunks.stdout +++ b/tests.merging/conflict-chunks.stdout @@ -1,4 +1,4 @@ -Merge conflicts in baserock:stratum2-hello: +Merge conflicts in test:stratum2-hello: conflict.txt -Merge conflicts in baserock:stratum3-hello: +Merge conflicts in test:stratum3-hello: conflict.txt diff --git a/tests.merging/conflict-morphology-kind.script b/tests.merging/conflict-morphology-kind.script index d8fcc6ef..235d8130 100755 --- a/tests.merging/conflict-morphology-kind.script +++ b/tests.merging/conflict-morphology-kind.script @@ -20,13 +20,13 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/unmergable +"$SRCDIR/scripts/test-morph" checkout test:morphs master +"$SRCDIR/scripts/test-morph" branch test:morphs test/unmergable -cd "$DATADIR/workspace/test/unmergable/baserock:morphs" +cd "$DATADIR/workspace/test/unmergable/test:morphs" "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum sed -ie 's/"kind": "stratum"/"kind": "chunk"/' hello-stratum.morph git commit --quiet --all -m "Unmergeable because kind has changed" -cd "$DATADIR/workspace/master/baserock:morphs" +cd "$DATADIR/workspace/master/test:morphs" "$SRCDIR/scripts/test-morph" merge test/unmergable 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": [] diff --git a/tests.merging/conflict-stratum-field-ordering.stdout b/tests.merging/conflict-stratum-field-ordering.stdout index cce0973c..f55822a9 100644 --- a/tests.merging/conflict-stratum-field-ordering.stdout +++ b/tests.merging/conflict-stratum-field-ordering.stdout @@ -1,2 +1,2 @@ -Merge conflicts in baserock:morphs: +Merge conflicts in test:morphs: hello-stratum.morph diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script index 2ead7f0f..a4661622 100755 --- a/tests.merging/from-branch-not-checked-out.script +++ b/tests.merging/from-branch-not-checked-out.script @@ -22,7 +22,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master # 'From' branch is not checked out (and also doesn't exist, but that diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index d2a59349..1e3befbd 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -29,32 +29,32 @@ fi # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello # Chunk moves to a new location (we manually update the ref back to master # here, so 'morph edit' can create a system branch in the new repo from it). git clone -q "$DATADIR/hello" "$DATADIR/hello-lorried" -cd "$DATADIR/workspace/baserock/newbranch/baserock:morphs" -sed -e 's/"repo": "baserock:hello"/"repo": "baserock:hello-lorried"/' \ +cd "$DATADIR/workspace/baserock/newbranch/test:morphs" +sed -e 's/"repo": "test:hello"/"repo": "test:hello-lorried"/' \ -e 's/"ref": "baserock\/newbranch"/"ref": "master"/' \ -i hello-stratum.morph git commit -q --all -m "'hello' repository has moved" # Now we further edit the chunk, just for fun. "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd "$DATADIR/workspace/baserock/newbranch/baserock:hello-lorried" +cd "$DATADIR/workspace/baserock/newbranch/test:hello-lorried" touch newfile.txt git add newfile.txt git commit -m "Add new file" --quiet -cd "$DATADIR/workspace/baserock/newbranch/baserock:morphs" +cd "$DATADIR/workspace/baserock/newbranch/test:morphs" git commit -q --all -m "Update system branch refs" # Try to merge changes back to master (should fail, because we don't support # adding chunks inside branches yet). cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master "$SRCDIR/scripts/test-morph" merge baserock/newbranch diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script index 06969b70..fb76491b 100755 --- a/tests.merging/rename-chunk.script +++ b/tests.merging/rename-chunk.script @@ -28,11 +28,11 @@ fi # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch # Rename the chunk, and then commit a seperate change "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd baserock/newbranch/baserock:hello +cd baserock/newbranch/test:hello cat hello.morph | sed -e 's/"name": "hello"/"name": "goodbye"/' > goodbye.morph git rm -q hello.morph @@ -44,19 +44,19 @@ git add newfile.txt git commit -m "Add new file" --quiet # Update stratum to point at the renamed chunk -cd ../baserock:morphs +cd ../test:morphs sed -ie 's/"name": "hello"/"name": "goodbye"/' hello-stratum.morph git commit --all --quiet -m "Update morph refs for baserock/newbranch" # Merge changes back to master cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master "$SRCDIR/scripts/test-morph" merge baserock/newbranch # Morph should have realised that 'goodbye' is not a new chunk, # and pulled in the changes from 'hello' in the old branch -cd baserock:hello +cd test:hello [ ! -e hello.morph ] [ -e goodbye.morph ] [ -e newfile.txt ] diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index a7ba8699..64fb7e15 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -29,7 +29,7 @@ fi # Create system branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch # The user may 'morph edit hello-system hello-stratum hello' and commit here: # we currently silently ignore her changes on merge, because we don't @@ -37,7 +37,7 @@ cd "$DATADIR/workspace" # Rename the stratum "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum -cd baserock/newbranch/baserock:morphs +cd baserock/newbranch/test:morphs sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/'\ -i hello-system.morph @@ -53,6 +53,6 @@ git commit -q --all -m "Rename hello-stratum to goodbye-stratum" # Merge changes back to master (this should fail, because we don't support # adding strata inside branches yet). cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master cd master "$SRCDIR/scripts/test-morph" merge baserock/newbranch diff --git a/tests.merging/rename-stratum.stderr b/tests.merging/rename-stratum.stderr index ff408036..760501fc 100644 --- a/tests.merging/rename-stratum.stderr +++ b/tests.merging/rename-stratum.stderr @@ -1 +1 @@ -ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/baserock:morphs at ref 804a475402fb6ded64a2749c7adf5b33c7c8ce1e +ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/test:morphs at ref 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 diff --git a/tests.merging/setup b/tests.merging/setup index f075e7b1..c0dfd969 100755 --- a/tests.merging/setup +++ b/tests.merging/setup @@ -29,7 +29,7 @@ source "$SRCDIR/scripts/fix-committer-info" # Create a morph configuration file cat <<EOF > "$DATADIR/morph.conf" [config] -repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s +repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s cachedir = $DATADIR/workspace/.morph/cache log = $DATADIR/morph.log keep-path = true @@ -58,7 +58,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" "strata": [ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", "ref": "master" } ] @@ -72,7 +72,7 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" "chunks": [ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", "ref": "master", "build-depends": [] } diff --git a/tests.merging/warn-if-merging-petrified-morphologies.script b/tests.merging/warn-if-merging-petrified-morphologies.script index 12e726ed..a81c0237 100755 --- a/tests.merging/warn-if-merging-petrified-morphologies.script +++ b/tests.merging/warn-if-merging-petrified-morphologies.script @@ -21,12 +21,12 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master -"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrified +"$SRCDIR/scripts/test-morph" checkout test:morphs master +"$SRCDIR/scripts/test-morph" branch test:morphs test/petrified -cd "$DATADIR/workspace/test/petrified/baserock:morphs" +cd "$DATADIR/workspace/test/petrified/test:morphs" "$SRCDIR/scripts/test-morph" petrify git commit --quiet --all -m "Petrify branch" -cd "$DATADIR/workspace/master/baserock:morphs" +cd "$DATADIR/workspace/master/test:morphs" "$SRCDIR/scripts/test-morph" merge test/petrified |