diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-14 15:17:33 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-14 15:17:33 +0000 |
| commit | bfad258d85d25c4eb5b3232d464ab6634492b17d (patch) | |
| tree | 83f2190877f0f7cfb8bbe60a00ca893dde9139f2 /tests | |
| parent | 3050d3c01db5c16622e7293f47f91e8b085da4cb (diff) | |
| download | morph-bfad258d85d25c4eb5b3232d464ab6634492b17d.tar.gz | |
tests: amend to not consider stratum metadata
These tests were failing because the stratum metadata was added to
the cache.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/build-stratum-with-submodules.script | 2 | ||||
| -rwxr-xr-x | tests/build-stratum.script | 2 | ||||
| -rwxr-xr-x | tests/name-clash.script | 2 | ||||
| -rwxr-xr-x | tests/rebuild-cached-stratum.script | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/build-stratum-with-submodules.script b/tests/build-stratum-with-submodules.script index 6dd424b2..c67aa97e 100755 --- a/tests/build-stratum-with-submodules.script +++ b/tests/build-stratum-with-submodules.script @@ -66,7 +66,7 @@ EOF "$SRCDIR/scripts/test-morph" build test:morphs-repo master submod-stratum.morph "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \ - "$DATADIR/cache/artifacts/"*.stratum.* \ + "$DATADIR/cache/artifacts/"*submod-stratum \ "$DATADIR/stratum.tar" tar -tf "$DATADIR/stratum.tar" | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/build-stratum.script b/tests/build-stratum.script index d1f790ca..8e16423e 100755 --- a/tests/build-stratum.script +++ b/tests/build-stratum.script @@ -21,7 +21,7 @@ set -eu "$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-stratum.morph "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \ - "$DATADIR/cache/artifacts/"*.stratum.* \ + "$DATADIR/cache/artifacts/"*.hello-stratum \ "$DATADIR/stratum.tar" tar -tf "$DATADIR/stratum.tar" | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/name-clash.script b/tests/name-clash.script index f1c866f9..8187c813 100755 --- a/tests/name-clash.script +++ b/tests/name-clash.script @@ -57,7 +57,7 @@ EOF INSTDIR="$DATADIR"/unpack mkdir -p "$INSTDIR" "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \ - "$DATADIR/cache/artifacts/"*hello-stratum* \ + "$DATADIR/cache/artifacts/"*hello-stratum \ "$DATADIR/stratum.tar" tar -C "$INSTDIR" -xhf "$DATADIR/stratum.tar" test "$("$INSTDIR"/bin/hello)" = "hello, world" diff --git a/tests/rebuild-cached-stratum.script b/tests/rebuild-cached-stratum.script index c0022ba6..1bea1ae6 100755 --- a/tests/rebuild-cached-stratum.script +++ b/tests/rebuild-cached-stratum.script @@ -40,7 +40,7 @@ cache="$DATADIR/cache/artifacts" "$SRCDIR/scripts/test-morph" \ build test:morphs-repo rebuild-cached-stratum hello-stratum.morph echo "first build:" -(cd "$cache" && ls *.chunk.* *.stratum.* | sed 's/^[^.]*\./ /' | +(cd "$cache" && ls *.chunk.* *hello-stratum | sed 's/^[^.]*\./ /' | LC_ALL=C sort) # Change the chunk. @@ -52,6 +52,6 @@ echo "first build:" "$SRCDIR/scripts/test-morph" \ build test:morphs-repo rebuild-cached-stratum hello-stratum.morph echo "second build:" -(cd "$cache" && ls *.chunk.* *.stratum.* | sed 's/^[^.]*\./ /' | +(cd "$cache" && ls *.chunk.* *hello-stratum | sed 's/^[^.]*\./ /' | LC_ALL=C sort) |