Fix paths for chunk directories in cmdtests

9 files changed, 30 insertions, 30 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.