aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-05-30 12:04:05 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-05-30 12:04:05 +0200
commit760d75fad0148a053bae06905e46fe99e641135d (patch)
tree8c65804359669760497f77e4089f8714a648a4f2 /tests
parent3c8e389347445913fb3329a53decf04e0af87735 (diff)
Explicitly pass -z during .tar.gz extraction in tests for OpenBSD tar
Diffstat (limited to 'tests')
-rw-r--r--tests/pkg-build.testscript8
-rw-r--r--tests/remote-git.testscript2
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index 74fbb67..bb6b207 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -1525,7 +1525,7 @@ test.options += --no-progress
#
r = 1/t9-1
+cp -r $rep/t9 $r && \
- tar xf $r/libbar-1.0.0.tar.gz -C $r && \
+ tar xfz $r/libbar-1.0.0.tar.gz -C $r && \
mv $r/libbar-1.0.0 $r/libbar-2.0.0 && \
sed -i -e 's/(version:).+/\1 2.0.0/' $r/libbar-2.0.0/manifest && \
tar cfz $r/libbar-2.0.0.tar.gz -C $r libbar-2.0.0 &$r/libbar-2.0.0.tar.gz && \
@@ -1537,7 +1537,7 @@ test.options += --no-progress
#
r = 1/t9-2
+cp -r 1/t9-1 $r && \
- tar xf $r/libbaz-1.0.0.tar.gz -C $r && \
+ tar xfz $r/libbaz-1.0.0.tar.gz -C $r && \
mv $r/libbaz-1.0.0 $r/libbaz-2.0.0 && \
sed -i -e 's/(version:).+/\1 2.0.0/' -e 's/(depends: libbar).+/\1 ^2.0.0/' $r/libbaz-2.0.0/manifest && \
tar cfz $r/libbaz-2.0.0.tar.gz -C $r libbaz-2.0.0 &$r/libbaz-2.0.0.tar.gz && \
@@ -1549,7 +1549,7 @@ test.options += --no-progress
#
r = 1/t9-3
+cp -r 1/t9-2 $r && \
- tar xf $r/libbox-1.0.0.tar.gz -C $r && \
+ tar xfz $r/libbox-1.0.0.tar.gz -C $r && \
mv $r/libbox-1.0.0 $r/libbox-1.1.0 && \
sed -i -e 's/(version:).+/\1 1.1.0/' $r/libbox-1.1.0/manifest && \
tar cfz $r/libbox-1.1.0.tar.gz -C $r libbox-1.1.0 &$r/libbox-1.1.0.tar.gz && \
@@ -4032,7 +4032,7 @@ test.options += --no-progress
{
+$clone_cfg
- +tar (!$posix ? --force-local : ) -xf $src/t8a/fax-1.0.0.tar.gz &fax-1.0.0/***
+ +tar (!$posix ? --force-local : ) -xfz $src/t8a/fax-1.0.0.tar.gz &fax-1.0.0/***
+mv fax-1.0.0 fax
: change-manifest
diff --git a/tests/remote-git.testscript b/tests/remote-git.testscript
index 308c067..0885abd 100644
--- a/tests/remote-git.testscript
+++ b/tests/remote-git.testscript
@@ -66,7 +66,7 @@ else
end
# Command for extracting the git repository from a tarball into the output
-# directory (see above).
+# directory (see above). Note: should only be used for .tar, not .tar.gz.
#
# Note that we can expect that the tar program is present on the platform. We
# will use the same options as we do for unpacking of package archives (see