From 2c4752d71d35ec31221dcdab1289d2084936ccae Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 6 Mar 2014 17:20:06 +0000 Subject: Fix paths for chunk directories in cmdtests --- tests.as-root/branch-from-image-works.script | 2 +- .../build-handles-stratum-build-depends.script | 4 +- tests.as-root/build-with-external-strata.script | 4 +- ...iple-times-doesnt-generate-new-artifacts.script | 4 +- ...system-branch-picks-up-committed-removes.script | 12 +-- ...stem-branch-picks-up-uncommitted-changes.script | 12 +-- .../building-a-system-branch-works-anywhere.script | 6 +- .../building-creates-correct-temporary-refs.script | 10 +-- ...hology-contents-do-not-change-cache-keys.script | 6 +- tests.branching/add-then-edit.script | 6 +- tests.branching/ambiguous-refs.script | 6 +- ...reates-new-system-branch-not-from-master.script | 6 +- ...reates-new-system-branch-not-from-master.stdout | 11 +-- .../branch-creates-new-system-branch.script | 6 +- .../branch-creates-new-system-branch.stdout | 9 ++- tests.branching/branch-works-anywhere.script | 4 +- tests.branching/branch-works-anywhere.stdout | 90 ++++++++++++---------- tests.branching/checkout-existing-branch.script | 4 +- tests.branching/checkout-existing-branch.stdout | 9 ++- tests.branching/checkout-works-anywhere.script | 4 +- tests.branching/checkout-works-anywhere.stdout | 27 ++++--- .../edit-checkouts-existing-chunk.script | 4 +- tests.branching/edit-handles-submodules.script | 4 +- tests.branching/edit-updates-stratum.script | 4 +- ...repository-stored-in-cloned-repositories.script | 8 +- tests.branching/petrify-no-double-petrify.script | 4 +- tests.branching/petrify.script | 6 +- tests.branching/status-in-dirty-branch.script | 4 +- tests.branching/tag-tag-works-as-expected.script | 4 +- .../workflow-separate-stratum-repos.script | 16 ++-- tests.branching/workflow.script | 6 +- tests.deploy/deploy-rawdisk.script | 4 +- tests.deploy/setup-build | 6 +- 33 files changed, 164 insertions(+), 148 deletions(-) diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script index c9d50bbb..fb0b09c9 100755 --- a/tests.as-root/branch-from-image-works.script +++ b/tests.as-root/branch-from-image-works.script @@ -50,7 +50,7 @@ workspace="$DATADIR/workspace" cd "$workspace" "$SRCDIR/scripts/test-morph" branch-from-image mybranch \ --metadata-dir="$extracted/baserock" -cd mybranch/test:morphs +cd mybranch/test/morphs grep -qFe "$hello_chunk_commit" hello-stratum.morph tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact build hello-tarball) tar -xf "$tar" bin/hello diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script index 22d07c72..6e6f82da 100755 --- a/tests.as-root/build-handles-stratum-build-depends.script +++ b/tests.as-root/build-handles-stratum-build-depends.script @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs test/stratum-build-depends -cd test/stratum-build-depends/test:morphs +cd test/stratum-build-depends/test/morphs # 'linux-system' and the build-depends fields of 'linux-stratum' need to # be updated here. Any build-depends of any altered strata also need to diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script index f5d86dfe..e43d0262 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ cd "$DATADIR/workspace" # 'morph build'. cd "branch1" "$SRCDIR/scripts/test-morph" edit hello-system stratum2 -cd "test:external-strata" +cd "test/external-strata" awk ' /^chunks:/ { 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 8852b96d..ac6cffec 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 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,6 +38,6 @@ cd "$DATADIR/workspace/branch1" [ "$ARTIFACT_COUNT" -eq $(ls "$DATADIR/cache/artifacts" | wc -l) ] # Build thrice, and that should be enough. -cd "$DATADIR/workspace/branch1/test:morphs" +cd "$DATADIR/workspace/branch1/test/morphs" "$SRCDIR/scripts/test-morph" build linux-system [ "$ARTIFACT_COUNT" -eq $(ls "$DATADIR/cache/artifacts" | wc -l) ] diff --git a/tests.as-root/building-a-system-branch-picks-up-committed-removes.script b/tests.as-root/building-a-system-branch-picks-up-committed-removes.script index fbfd2c0f..64ae82c7 100755 --- a/tests.as-root/building-a-system-branch-picks-up-committed-removes.script +++ b/tests.as-root/building-a-system-branch-picks-up-committed-removes.script @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ set -e . "$SRCDIR/tests.as-root/setup-build" KERNEL_BRANCH=baserock/builds/123456789/AABBCCDDE -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" git checkout --quiet master echo Use Morph >README git add README @@ -36,7 +36,7 @@ cd "$DATADIR/workspace" # Make a change elsewhere to be pulled in PEER_REPO="$DATADIR/peer-kernel" -git clone --quiet "file://$DATADIR/workspace/branch1/test:kernel-repo" \ +git clone --quiet "file://$DATADIR/workspace/branch1/test/kernel-repo" \ "$PEER_REPO" cd "$PEER_REPO" git checkout --quiet -b fix @@ -47,7 +47,7 @@ git checkout --quiet master git merge --no-ff fix >/dev/null 2>&1 # Pull a commit in to the linux morphology. -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" git remote add peer "file://$PEER_REPO" git remote update >/dev/null 2>&1 git merge --quiet peer/master @@ -55,8 +55,8 @@ git merge --quiet peer/master # Build the linux system again without comitting. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" build linux-system -cd branch1/test:kernel-repo +cd branch1/test/kernel-repo # Check whether the new morphology exists in the temporary build ref -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" ! git cat-file blob "$KERNEL_BRANCH:README" >/dev/null 2>&1 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 8d298010..4dacb23e 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 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,13 +32,13 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" build linux-system # Print tree SHA1s of the build ref of morphs and kernel. -cd "$DATADIR/workspace/branch1/test:morphs" +cd "$DATADIR/workspace/branch1/test/morphs" MORPHS_SHA1="$(git rev-parse baserock/builds/123456789/987654321)" -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" KERNEL_SHA1="$(git rev-parse baserock/builds/123456789/AABBCCDDE)" # Make an uncommitted change to the linux morphology. -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" sed -i -e 's@touch@touch foo@g' linux.morph # Build the linux system again without comitting. @@ -49,7 +49,7 @@ cd "$DATADIR/workspace" # 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. -cd "$DATADIR/workspace/branch1/test:morphs" +cd "$DATADIR/workspace/branch1/test/morphs" [ "$(git rev-parse baserock/builds/123456789/987654321)" != "$MORPHS_SHA1" ] -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" [ "$(git rev-parse baserock/builds/123456789/AABBCCDDE)" != "$KERNEL_SHA1" ] 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 d5d1e52d..cf946cd5 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,13 +41,13 @@ cd "$DATADIR/workspace/branch1" rm -rf "$DATADIR/cache/artifacts"/* # Build form the branch root repository. -cd "$DATADIR/workspace/branch1/test:morphs" +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"/* # Build from the linux directory. -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output4" rm -rf "$DATADIR/cache/artifacts"/* diff --git a/tests.as-root/building-creates-correct-temporary-refs.script b/tests.as-root/building-creates-correct-temporary-refs.script index c0bf6a1e..6fb6c83a 100755 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ b/tests.as-root/building-creates-correct-temporary-refs.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,10 +35,10 @@ 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" \ +"$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" \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test/kernel-repo" \ show-ref | cut -d' ' -f2 echo @@ -48,8 +48,8 @@ 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" \ +"$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" \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test/kernel-repo" \ show-ref | cut -d' ' -f2 diff --git a/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script b/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script index ca92b2cb..a540cdee 100755 --- a/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script +++ b/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,8 +36,8 @@ cd "$DATADIR/workspace" ARTIFACT_COUNT="$(ls "$DATADIR/cache/artifacts" | wc -l)" # Petrify the refs, so the morphologies will be different -(set -e && cd branch1/test:morphs && git push --quiet origin HEAD) -(set -e && cd branch1/test:kernel-repo && git push --quiet origin HEAD) +(set -e && cd branch1/test/morphs && git push --quiet origin HEAD) +(set -e && cd branch1/test/kernel-repo && git push --quiet origin HEAD) "$SRCDIR/scripts/test-morph" petrify # Build with the petrified morphologies. diff --git a/tests.branching/add-then-edit.script b/tests.branching/add-then-edit.script index 5cd6e842..2dd62254 100755 --- a/tests.branching/add-then-edit.script +++ b/tests.branching/add-then-edit.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ cd "$DATADIR/workspace" cd "me/add-then-edit" # add a chunk -cd test:morphs +cd test/morphs ## Sub-optimally, to alter the stratum, you have to `morph edit` it first "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum @@ -51,4 +51,4 @@ with open("hello-stratum.morph", "w") as f: grep -qFe goodbye hello-stratum.morph # check whether edit has cloned the repository to the right branch -git --git-dir="../test:goodbye/.git" rev-parse --abbrev-ref HEAD +git --git-dir="../goodbye/.git" rev-parse --abbrev-ref HEAD diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index ed72f9e3..aeec61a1 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,10 +37,10 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs release # Create an extra ref to confuse any users of git show-ref -cd release/test: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/test:morphs" +cd "$DATADIR/workspace/release/test/morphs" "$SRCDIR/scripts/test-morph" petrify 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 72e21740..c561f191 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 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,8 +31,8 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch +"$SRCDIR/scripts/run-git-in" newbranch/test/morphs branch echo "Current origin:" -"$SRCDIR/scripts/run-git-in" newbranch/test: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 af65eb7b..c61624b4 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 @@ -3,12 +3,13 @@ d . d ./.morph d ./newbranch d ./newbranch/.morph-system-branch -d ./newbranch/test:morphs -d ./newbranch/test:morphs/.git +d ./newbranch/test +d ./newbranch/test/morphs +d ./newbranch/test/morphs/.git f ./newbranch/.morph-system-branch/config -f ./newbranch/test:morphs/hello-stratum.morph -f ./newbranch/test:morphs/hello-system.morph -f ./newbranch/test: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 c2d7f640..784bed62 100755 --- a/tests.branching/branch-creates-new-system-branch.script +++ b/tests.branching/branch-creates-new-system-branch.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,8 +31,8 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch +"$SRCDIR/scripts/run-git-in" newbranch/test/morphs branch echo "Current origin:" -"$SRCDIR/scripts/run-git-in" newbranch/test: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 ba1651e5..a7318378 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -3,11 +3,12 @@ d . d ./.morph d ./newbranch d ./newbranch/.morph-system-branch -d ./newbranch/test:morphs -d ./newbranch/test:morphs/.git +d ./newbranch/test +d ./newbranch/test/morphs +d ./newbranch/test/morphs/.git f ./newbranch/.morph-system-branch/config -f ./newbranch/test:morphs/hello-stratum.morph -f ./newbranch/test: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-works-anywhere.script b/tests.branching/branch-works-anywhere.script index ee8f5bfa..7f6156ce 100755 --- a/tests.branching/branch-works-anywhere.script +++ b/tests.branching/branch-works-anywhere.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ 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/test:morphs" +cd "$DATADIR/workspace/branch3/test/morphs" "$SRCDIR/scripts/test-morph" branch test:morphs branch4 echo "Workspace after creating the fourth branch:" diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index 0b59ce71..4e317902 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -3,80 +3,90 @@ d . d ./.morph d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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 d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/test:morphs -d ./branch2/test:morphs/.git +d ./branch2/test +d ./branch2/test/morphs +d ./branch2/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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/test:morphs/hello-stratum.morph -f ./branch2/test: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 d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/test:morphs -d ./branch2/test:morphs/.git +d ./branch2/test +d ./branch2/test/morphs +d ./branch2/test/morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/test:morphs -d ./branch3/test:morphs/.git +d ./branch3/test +d ./branch3/test/morphs +d ./branch3/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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/test:morphs/hello-stratum.morph -f ./branch2/test: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/test:morphs/hello-stratum.morph -f ./branch3/test: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 d ./branch1 d ./branch1/.morph-system-branch -d ./branch1/test:morphs -d ./branch1/test:morphs/.git +d ./branch1/test +d ./branch1/test/morphs +d ./branch1/test/morphs/.git d ./branch2 d ./branch2/.morph-system-branch -d ./branch2/test:morphs -d ./branch2/test:morphs/.git +d ./branch2/test +d ./branch2/test/morphs +d ./branch2/test/morphs/.git d ./branch3 d ./branch3/.morph-system-branch -d ./branch3/test:morphs -d ./branch3/test:morphs/.git +d ./branch3/test +d ./branch3/test/morphs +d ./branch3/test/morphs/.git d ./branch4 d ./branch4/.morph-system-branch -d ./branch4/test:morphs -d ./branch4/test:morphs/.git +d ./branch4/test +d ./branch4/test/morphs +d ./branch4/test/morphs/.git f ./branch1/.morph-system-branch/config -f ./branch1/test:morphs/hello-stratum.morph -f ./branch1/test: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/test:morphs/hello-stratum.morph -f ./branch2/test: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/test:morphs/hello-stratum.morph -f ./branch3/test: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/test:morphs/hello-stratum.morph -f ./branch4/test:morphs/hello-system.morph +f ./branch4/test/morphs/hello-stratum.morph +f ./branch4/test/morphs/hello-system.morph diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script index 653fffb5..b1740d9c 100755 --- a/tests.branching/checkout-existing-branch.script +++ b/tests.branching/checkout-existing-branch.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,4 +30,4 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" master/test: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 0f51893a..a6026269 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -3,10 +3,11 @@ d . d ./.morph d ./master d ./master/.morph-system-branch -d ./master/test:morphs -d ./master/test:morphs/.git +d ./master/test +d ./master/test/morphs +d ./master/test/morphs/.git f ./master/.morph-system-branch/config -f ./master/test:morphs/hello-stratum.morph -f ./master/test: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 02deb4d7..14d18842 100755 --- a/tests.branching/checkout-works-anywhere.script +++ b/tests.branching/checkout-works-anywhere.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ cd workspace # This time, create a new branch and check out the master branch # from within that branch. "$SRCDIR/scripts/test-morph" branch test:morphs newbranch -cd newbranch/test:morphs +cd newbranch/test/morphs "$SRCDIR/scripts/test-morph" checkout test:morphs master echo "Workspace after checking out master from within a new branch:" diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout index ba83058f..ed8b1567 100644 --- a/tests.branching/checkout-works-anywhere.stdout +++ b/tests.branching/checkout-works-anywhere.stdout @@ -3,25 +3,28 @@ d . d ./.morph d ./master d ./master/.morph-system-branch -d ./master/test:morphs -d ./master/test:morphs/.git +d ./master/test +d ./master/test/morphs +d ./master/test/morphs/.git f ./master/.morph-system-branch/config -f ./master/test:morphs/hello-stratum.morph -f ./master/test: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 d ./master d ./master/.morph-system-branch -d ./master/test:morphs -d ./master/test:morphs/.git +d ./master/test +d ./master/test/morphs +d ./master/test/morphs/.git d ./newbranch d ./newbranch/.morph-system-branch -d ./newbranch/test:morphs -d ./newbranch/test:morphs/.git +d ./newbranch/test +d ./newbranch/test/morphs +d ./newbranch/test/morphs/.git f ./master/.morph-system-branch/config -f ./master/test:morphs/hello-stratum.morph -f ./master/test: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/test:morphs/hello-stratum.morph -f ./newbranch/test: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 9e66ceb0..c8fb9312 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,4 +34,4 @@ echo "Current branches:" echo echo "Files in hello:" -ls "$DATADIR/workspace/alfred/test:hello" +ls "$DATADIR/workspace/alfred/test/hello" diff --git a/tests.branching/edit-handles-submodules.script b/tests.branching/edit-handles-submodules.script index 72344119..2ab39420 100755 --- a/tests.branching/edit-handles-submodules.script +++ b/tests.branching/edit-handles-submodules.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,6 +28,6 @@ cd "$DATADIR/workspace" # Submodules should be set up automatically "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd "$DATADIR/workspace/newbranch/test:hello" +cd "$DATADIR/workspace/newbranch/test/hello" [ -e foolib/README ] diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index bfe16c8b..cf5fc26d 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,4 +29,4 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello # See what effect the editing had. -"$SRCDIR/scripts/run-git-in" "newbranch/test:morphs" diff +"$SRCDIR/scripts/run-git-in" "newbranch/test/morphs" diff diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script index c2dc8690..342c3d0b 100755 --- a/tests.branching/morph-repository-stored-in-cloned-repositories.script +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch test:morphs newbranch echo "morph.repository in branch root repository:" -cd "$DATADIR/workspace/newbranch/test:morphs" +cd "$DATADIR/workspace/newbranch/test/morphs" git config morph.repository echo @@ -37,7 +37,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout test:morphs master echo "morph.repository in branch root repository of a checkout:" -cd "$DATADIR/workspace/master/test:morphs" +cd "$DATADIR/workspace/master/test/morphs" git config morph.repository echo @@ -45,5 +45,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/test:hello" +cd "$DATADIR/workspace/master/test/hello" git config morph.repository diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script index 9484aa58..3c9185dc 100755 --- a/tests.branching/petrify-no-double-petrify.script +++ b/tests.branching/petrify-no-double-petrify.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs test/petrify -cd test/petrify/test:morphs +cd test/petrify/test/morphs git push --quiet origin HEAD "$SRCDIR/scripts/test-morph" petrify "$SRCDIR/scripts/test-morph" petrify diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index fed8e965..5a3cb8c4 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,10 +27,10 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs test/petrify master -cd test/petrify/test:morphs +cd test/petrify/test/morphs git push --quiet origin HEAD "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye -(cd ../test:goodbye && git push --quiet origin HEAD) +(cd ../goodbye && git push --quiet origin HEAD) "$SRCDIR/scripts/test-morph" petrify echo "Petrified:" diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script index cc1dd46e..7fdd8862 100755 --- a/tests.branching/status-in-dirty-branch.script +++ b/tests.branching/status-in-dirty-branch.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2013 Codethink Limited +# Copyright (C) 2011-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ cd "$DATADIR/workspace" cd branch1 "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -cd test:stratum2-hello +cd test/stratum2-hello git checkout -q master cd .. diff --git a/tests.branching/tag-tag-works-as-expected.script b/tests.branching/tag-tag-works-as-expected.script index 006b98bf..95315de4 100755 --- a/tests.branching/tag-tag-works-as-expected.script +++ b/tests.branching/tag-tag-works-as-expected.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" tag example-tag -- -m First # Check out the tag. -"$SRCDIR/scripts/run-git-in" master/test:morphs checkout -b example-tag \ +"$SRCDIR/scripts/run-git-in" master/test/morphs checkout -b example-tag \ 2>/dev/null # Tag the tag. diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script index 3faf23f5..f2fd519b 100755 --- a/tests.branching/workflow-separate-stratum-repos.script +++ b/tests.branching/workflow-separate-stratum-repos.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,23 +35,23 @@ cd "$DATADIR/workspace" # Edit one chunk cd "me/readme-fixes" "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello -cd "$DATADIR/workspace/me/readme-fixes/test: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/test: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 ../test:external-strata +cd ../test/external-strata git commit --quiet --all -m "Commit changes for system branch" -cd ../test:morphs +cd ../test/morphs git commit --quiet --all -m "Commit changes for system branch" # Merge our system branch into master @@ -60,13 +60,13 @@ cd master "$SRCDIR/scripts/test-morph" merge me/readme-fixes # Check the changes have appeared -cd test:morphs +cd test/morphs [ $(git rev-parse HEAD) = $(git rev-parse master) ] -cd ../test:stratum2-hello +cd ../test/stratum2-hello [ -e README ] [ $(git rev-parse HEAD) = $(git rev-parse master) ] -cd ../test: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 10383132..51a8d106 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello -cd me/readme-fix/test:hello +cd me/readme-fix/test/hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet -cd ../test:morphs +cd ../morphs git commit --quiet --all -m "Commit changes for system branch" cd "$DATADIR/workspace" diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script index 257ef0dd..3489a198 100755 --- a/tests.deploy/deploy-rawdisk.script +++ b/tests.deploy/deploy-rawdisk.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,6 +28,6 @@ cd "$DATADIR/workspace/branch1" "$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \ deploy rawdisk_test_cluster > /dev/null -outputdir="test:morphs" +outputdir="test/morphs" test -e $outputdir/disk.img diff --git a/tests.deploy/setup-build b/tests.deploy/setup-build index 6c0a6252..0fc561f9 100644 --- a/tests.deploy/setup-build +++ b/tests.deploy/setup-build @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012, 2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,8 +28,8 @@ cd "$DATADIR/workspace" # 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" \ +git config -f "$DATADIR/workspace/branch1/test/morphs/.git/config" \ morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ +git config -f "$DATADIR/workspace/branch1/test/kernel-repo/.git/config" \ morph.uuid AABBCCDDE -- cgit v1.2.1