summaryrefslogtreecommitdiff
path: root/tests.build/prefix.script
diff options
context:
space:
mode:
Diffstat (limited to 'tests.build/prefix.script')
-rwxr-xr-xtests.build/prefix.script12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests.build/prefix.script b/tests.build/prefix.script
index 662be704..5713e125 100755
--- a/tests.build/prefix.script
+++ b/tests.build/prefix.script
@@ -19,9 +19,10 @@
set -eu
-# Create two chunks which print out PATH and PREFIX from their environment.
-cd "$DATADIR/chunk-repo"
+cd "$DATADIR/morphs-repo"
git checkout -q master
+
+# Create two chunks which print out PATH and PREFIX from their environment.
cat <<\EOF > xyzzy.morph
name: xyzzy
kind: chunk
@@ -44,18 +45,19 @@ git add plugh.morph
git commit -q -m "Add chunks"
# Change stratum to include those two chunks, and use a custom install prefix
-cd "$DATADIR/morphs-repo"
cat <<EOF > hello-stratum.morph
name: hello-stratum
kind: stratum
chunks:
- name: xyzzy
+ morph: xyzzy.morph
repo: test:chunk-repo
ref: master
build-depends: []
build-mode: test
prefix: /plover
- name: plugh
+ morph: plugh.morph
repo: test:chunk-repo
ref: master
build-mode: test
@@ -69,6 +71,6 @@ git commit -q -m "Update stratum"
test:morphs-repo master hello-system
cd "$DATADIR/cache/artifacts"
-first_chunk=$(ls -1 *.chunk.xyzzy-* | head -n1 | cut -c -64)
-second_chunk=$(ls -1 *.chunk.plugh-* | head -n1 | cut -c -64)
+first_chunk=$(ls -1 *.chunk.xyzzy* | head -n1 | cut -c -64)
+second_chunk=$(ls -1 *.chunk.plugh* | head -n1 | cut -c -64)
cat $first_chunk.build-log $second_chunk.build-log