diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-04-14 15:08:52 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-04-14 15:10:07 +0000 |
commit | ba8ca5c057b46719688958bb5f197029c761a2c3 (patch) | |
tree | b3b1b6499914d6569b1606e3aa338c6a00ef90f5 /tests.build/prefix.script | |
parent | c484d623ba500479452aa37bf6c52d2d128d1dde (diff) | |
download | morph-ba8ca5c057b46719688958bb5f197029c761a2c3.tar.gz |
Fix the cmdtests to understand the OSTree artifact cache
This commit also disables the cross-bootstrap test, as the
cross-bootstrap plugin needs rewriting to use OSTree.
Diffstat (limited to 'tests.build/prefix.script')
-rwxr-xr-x | tests.build/prefix.script | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests.build/prefix.script b/tests.build/prefix.script index 140617e1..f8aa48a4 100755 --- a/tests.build/prefix.script +++ b/tests.build/prefix.script @@ -66,7 +66,13 @@ git commit -q -m "Update stratum" "$SRCDIR/scripts/test-morph" build-morphology \ test:morphs-repo master hello-system +cd "$DATADIR" +"$SRCDIR/scripts/test-morph" init workspace +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" checkout test:morphs-repo master + +cd "$DATADIR/workspace/master/test/morphs-repo" +first_chunk=$("$SRCDIR/scripts/test-morph" query-cache hello-system.morph xyzzy | head -n1 | cut -c -64) +second_chunk=$("$SRCDIR/scripts/test-morph" query-cache hello-system.morph plugh | head -n1 | cut -c -64) 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) cat $first_chunk.build-log $second_chunk.build-log |