From eeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 7 Nov 2012 16:04:05 +0000 Subject: tests: Always use test:morphs for morphs repo Some tests were using test:morphs-repo instead. --- tests.as-root/archless-system-fails.script | 6 ++--- ...iple-times-doesnt-generate-new-artifacts.script | 2 +- ...iple-times-doesnt-generate-new-artifacts.stdout | 18 +++++++-------- ...stem-branch-picks-up-uncommitted-changes.script | 26 ++++------------------ ...stem-branch-picks-up-uncommitted-changes.stdout | 4 ++-- .../building-a-system-branch-works-anywhere.script | 2 +- .../building-a-system-branch-works-anywhere.stdout | 6 ++--- .../building-creates-correct-temporary-refs.script | 4 ++-- tests.as-root/disk-builds-rootfs-and-kernel.script | 6 ++--- tests.as-root/make-patch.script | 20 ++++++++--------- .../rootfs-tarball-builds-rootfs-and-kernel.script | 6 ++--- tests.as-root/setup | 6 ++--- .../syslinux-disk-builds-rootfs-and-kernel.script | 6 ++--- .../syslinux-fails-if-no-mbr-found.script | 6 ++--- tests.as-root/system-overlap.script | 8 +++---- tests.as-root/tarball-image-is-sensible.script | 2 +- tests.as-root/tarball-image-is-sensible.setup | 8 +++---- 17 files changed, 59 insertions(+), 77 deletions(-) (limited to 'tests.as-root') 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 <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 60093f97..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 @@ -40,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 b402355e..1ce59b0f 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -41,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 c69eb6a8..8c6f8807 100755 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ b/tests.as-root/building-creates-correct-temporary-refs.script @@ -27,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" \ @@ -40,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 <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 < "$DATADIR/morphs-repo/hello-stratum.morph" +cat < "$DATADIR/morphs/hello-stratum.morph" { "name": "hello-stratum", "kind": "stratum", @@ -42,12 +42,12 @@ cat < "$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 <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 < hello-system.morph "strata": [ { "morph": "hello-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "master" } ] @@ -135,7 +135,7 @@ cat < linux-system.morph "strata": [ { "morph": "linux-stratum", - "repo": "test:morphs-repo", + "repo": "test:morphs", "ref": "master" } ] 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 <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 <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 <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 < hello-tarball.morph @@ -51,17 +51,17 @@ cat < 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" } ] -- cgit v1.2.1