From f33553534538be564461d57f81a63ffa4ca6fd54 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 14 Jun 2012 15:50:03 +0000
Subject: tests: fix missing baserock meta files

This adds the ability to do this to the script, and fixes use of
the script to add the new parameter.
---
 tests/build-stratum-with-submodules.script         | 2 +-
 tests/build-stratum.script                         | 2 +-
 tests/name-clash.script                            | 2 +-
 tests/stratum-overlap-keeps-directory-links.script | 2 +-
 tests/stratum-overlap-stomps-file-links.script     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/build-stratum-with-submodules.script b/tests/build-stratum-with-submodules.script
index c67aa97e..7d44caf6 100755
--- a/tests/build-stratum-with-submodules.script
+++ b/tests/build-stratum-with-submodules.script
@@ -67,6 +67,6 @@ EOF
 "$SRCDIR/scripts/test-morph" build test:morphs-repo master submod-stratum.morph
 "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
                                    "$DATADIR/cache/artifacts/"*submod-stratum \
-                                   "$DATADIR/stratum.tar"
+                                   "$DATADIR/stratum.tar" submod-stratum
 tar -tf "$DATADIR/stratum.tar" | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
 
diff --git a/tests/build-stratum.script b/tests/build-stratum.script
index 8e16423e..f4fa15a1 100755
--- a/tests/build-stratum.script
+++ b/tests/build-stratum.script
@@ -22,6 +22,6 @@ set -eu
 "$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-stratum.morph
 "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
                                    "$DATADIR/cache/artifacts/"*.hello-stratum \
-                                   "$DATADIR/stratum.tar"
+                                   "$DATADIR/stratum.tar" hello-stratum
 tar -tf "$DATADIR/stratum.tar" | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
 
diff --git a/tests/name-clash.script b/tests/name-clash.script
index 8187c813..dcc04a8a 100755
--- a/tests/name-clash.script
+++ b/tests/name-clash.script
@@ -58,6 +58,6 @@ INSTDIR="$DATADIR"/unpack
 mkdir -p "$INSTDIR"
 "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
                                    "$DATADIR/cache/artifacts/"*hello-stratum \
-                                   "$DATADIR/stratum.tar"
+                                   "$DATADIR/stratum.tar" hello-stratum
 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 b0a8522b..2c5916aa 100755
--- a/tests/stratum-overlap-keeps-directory-links.script
+++ b/tests/stratum-overlap-keeps-directory-links.script
@@ -28,7 +28,7 @@ mkdir -p "$extracted"
     build test:morphs-repo overlap overlap-stratum.morph
 for f in "$cache"/*.stratum.overlap-stratum; do 
     "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
-                                   "$f" "$DATADIR/stratum.tar"
+                                   "$f" "$DATADIR/stratum.tar" overlap-stratum
     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 22271c2e..202e1f09 100755
--- a/tests/stratum-overlap-stomps-file-links.script
+++ b/tests/stratum-overlap-stomps-file-links.script
@@ -28,7 +28,7 @@ mkdir -p "$extracted"
     build test:morphs-repo overlap overlap-stratum.morph
 for f in "$cache"/*.stratum.overlap-stratum; do
     "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \
-                                   "$f" "$DATADIR/stratum.tar"
+                                   "$f" "$DATADIR/stratum.tar" overlap-stratum
     tar -xf "$DATADIR/stratum.tar" -C "$extracted"
 done
 test -f "$extracted/bin/foo"
-- 
cgit v1.2.1