tests: fix some that expected tarball strata

This required functionality to create a tarball from a json file.
This should probably be rewritten as a morph plugin and refactor it
to consolidate the creation logic, so e.g. the stratum metadata is
kept.

5 files changed, 18 insertions, 7 deletions

diff --git a/tests/build-stratum-with-submodules.script b/tests/build-stratum-with-submodules.script
index 9f226068..6dd424b2 100755
--- a/tests/build-stratum-with-submodules.script
+++ b/tests/build-stratum-with-submodules.script
@@ -65,6 +65,8 @@ EOF
 # No build and verify we got a stratum.
 
 "$SRCDIR/scripts/test-morph" build test:morphs-repo master submod-stratum.morph
-tar -tf "$DATADIR/cache/artifacts/"*.stratum.* | LC_ALL=C sort \
-    | sed '/^\.\/./s:^\./::'
+"$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
+                                   "$DATADIR/cache/artifacts/"*.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 994c4077..d1f790ca 100755
--- a/tests/build-stratum.script
+++ b/tests/build-stratum.script
@@ -20,6 +20,8 @@
 set -eu
 
 "$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-stratum.morph
-tar -tf "$DATADIR/cache/artifacts/"*.stratum.* | LC_ALL=C sort \
-    | sed '/^\.\/./s:^\./::'
+"$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
+                                   "$DATADIR/cache/artifacts/"*.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 669949ed..f1c866f9 100755
--- a/tests/name-clash.script
+++ b/tests/name-clash.script
@@ -56,5 +56,8 @@ EOF
 # unpack it and check the contents
 INSTDIR="$DATADIR"/unpack
 mkdir -p "$INSTDIR"
-tar -C "$INSTDIR" -xhf "$DATADIR/cache/artifacts/"*hello-stratum*
+"$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
+                                   "$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/stratum-overlap-keeps-directory-links.script b/tests/stratum-overlap-keeps-directory-links.script
index a995194f..b0a8522b 100755
--- a/tests/stratum-overlap-keeps-directory-links.script
+++ b/tests/stratum-overlap-keeps-directory-links.script
@@ -27,6 +27,8 @@ mkdir -p "$extracted"
 "$SRCDIR/scripts/test-morph" \
     build test:morphs-repo overlap overlap-stratum.morph
 for f in "$cache"/*.stratum.overlap-stratum; do 
-    tar -xf "$f" -C "$extracted"
+    "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
+                                   "$f" "$DATADIR/stratum.tar"
+    tar -xf "$DATADIR/stratum.tar" -C "$extracted"
 done
 test -h "$extracted/usr"
diff --git a/tests/stratum-overlap-stomps-file-links.script b/tests/stratum-overlap-stomps-file-links.script
index 0d429bbf..22271c2e 100755
--- a/tests/stratum-overlap-stomps-file-links.script
+++ b/tests/stratum-overlap-stomps-file-links.script
@@ -27,6 +27,8 @@ mkdir -p "$extracted"
 "$SRCDIR/scripts/test-morph" \
     build test:morphs-repo overlap overlap-stratum.morph
 for f in "$cache"/*.stratum.overlap-stratum; do
-    tar -xf "$f" -C "$extracted"
+    "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
+                                   "$f" "$DATADIR/stratum.tar"
+    tar -xf "$DATADIR/stratum.tar" -C "$extracted"
 done
 test -f "$extracted/bin/foo"