diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-15 11:09:12 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-15 11:09:12 +0000 |
| commit | 21da7c08dc4c513ff327328d8e81e235616ad996 (patch) | |
| tree | db2558daa7fed3484dcc051049b30a345302937b /tests | |
| parent | 6d5f0cfc8307dfa8fd72fbb425a383f0a84f850e (diff) | |
| download | morph-21da7c08dc4c513ff327328d8e81e235616ad996.tar.gz | |
tests: stratum overlap tests files instead
Rather than parse the output of tar -tvf, extract the tarballs and
test the files.
This should hopefully be more stable than the output of tar
Diffstat (limited to 'tests')
4 files changed, 12 insertions, 6 deletions
diff --git a/tests/stratum-overlap-keeps-directory-links.script b/tests/stratum-overlap-keeps-directory-links.script index 0df4d797..a995194f 100755 --- a/tests/stratum-overlap-keeps-directory-links.script +++ b/tests/stratum-overlap-keeps-directory-links.script @@ -21,8 +21,12 @@ set -eu cache="$DATADIR/cache/artifacts" +extracted="$DATADIR/extracted" +mkdir -p "$extracted" "$SRCDIR/scripts/test-morph" \ build test:morphs-repo overlap overlap-stratum.morph -(cd "$cache" && for f in *.stratum.overlap-stratum; do tar -tvf "$f"; done | - sed 's/^\(\S*\)[^.]*\./\1 /' | LC_ALL=C sort) | grep '/usr -> /' +for f in "$cache"/*.stratum.overlap-stratum; do + tar -xf "$f" -C "$extracted" +done +test -h "$extracted/usr" diff --git a/tests/stratum-overlap-keeps-directory-links.stdout b/tests/stratum-overlap-keeps-directory-links.stdout deleted file mode 100644 index a8c4be28..00000000 --- a/tests/stratum-overlap-keeps-directory-links.stdout +++ /dev/null @@ -1 +0,0 @@ -lrwxrwxrwx /usr -> / diff --git a/tests/stratum-overlap-stomps-file-links.script b/tests/stratum-overlap-stomps-file-links.script index 0c76d69c..0d429bbf 100755 --- a/tests/stratum-overlap-stomps-file-links.script +++ b/tests/stratum-overlap-stomps-file-links.script @@ -21,8 +21,12 @@ set -eu cache="$DATADIR/cache/artifacts" +extracted="$DATADIR/extracted" +mkdir -p "$extracted" "$SRCDIR/scripts/test-morph" \ build test:morphs-repo overlap overlap-stratum.morph -(cd "$cache" && for f in *.stratum.overlap-stratum; do tar -tvf "$f"; done | - sed 's/^\(\S*\)[^.]*\./\1 /' | LC_ALL=C sort) | grep -F '/bin/foo' +for f in "$cache"/*.stratum.overlap-stratum; do + tar -xf "$f" -C "$extracted" +done +test -f "$extracted/bin/foo" diff --git a/tests/stratum-overlap-stomps-file-links.stdout b/tests/stratum-overlap-stomps-file-links.stdout deleted file mode 100644 index 354c74fe..00000000 --- a/tests/stratum-overlap-stomps-file-links.stdout +++ /dev/null @@ -1 +0,0 @@ --rw-r--r-- /bin/foo |