summaryrefslogtreecommitdiff
path: root/tests.as-root/tarball-image-is-sensible.script
diff options
context:
space:
mode:
Diffstat (limited to 'tests.as-root/tarball-image-is-sensible.script')
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.script9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script
index 717d8e36..6e4af67b 100755
--- a/tests.as-root/tarball-image-is-sensible.script
+++ b/tests.as-root/tarball-image-is-sensible.script
@@ -26,14 +26,11 @@ esac
. "$SRCDIR/scripts/fix-committer-info"
-tar=$("$SRCDIR/morph" \
- --no-default-config --config="$DATADIR/morph.conf" --verbose \
- build-morphology test:morphs-repo tarball-links hello-tarball 2>&1 |
- grep "system hello-tarball-rootfs is cached at" |
- sed -nre "s/^.*system hello-tarball-rootfs is cached at (\S+)$/\1/p")
+tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo tarball-links hello-tarball)
extracted="$DATADIR/extracted"
mkdir -p "$extracted"
cd "$extracted"
tar -xf "$tar"
-find . -mindepth 1 | LC_ALL=C sort -u | xargs ls -dF
+find . -mindepth 1 | xargs ls -dF | LC_ALL=C sort -u