use "./gzip" for gzip tests

diff --git a/tests/gzip/Makefile b/tests/gzip/Makefile
index f87682c7f35e283bd46fc3b6372c620ce55aa1db..ee993934a89ef7f45427dd811cf00acc526b02a9 100644 (file)
--- a/tests/gzip/Makefile
+++ b/tests/gzip/Makefile
@@ -9,7 +9,7 @@
 
 PRGDIR = ../../programs
 VOID   = /dev/null
-
+export PATH := .:$(PATH)
 
 .PHONY: all
 all: test-gzip-env test-helin-segv test-hufts test-keep test-list test-memcpy-abuse test-mixed test-null-suffix-clobber test-stdin test-trailing-nul test-unpack-invalid test-zdiff test-zgrep-context test-zgrep-f test-zgrep-signal test-znew-k test-z-suffix 
@@ -18,8 +18,8 @@ all: test-gzip-env test-helin-segv test-hufts test-keep test-list test-memcpy-ab
 .PHONY: zstd
 zstd:
        $(MAKE) -C $(PRGDIR) zstd
-       #alias gzip='$(PRGDIR)/zstd --format=gzip'
-       #ln -sf /drive_d/GitHub/zstd/programs/zstd /usr/local/bin/gzip
+       ln -sf $(PRGDIR)/zstd gzip
+       @echo PATH=$(PATH)
        gzip --version
 
 .PHONY: clean
@@ -33,9 +33,9 @@ clean:
 # validated only for Linux, OSX, Hurd and some BSD targets
 #------------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))
-#.PHONY: test-gzip-env test-helin-segv test-hufts test-keep test-list test-memcpy-abuse test-mixed test-null-suffix-clobber test-stdin test-trailing-nul test-unpack-invalid test-zdiff test-zgrep-context test-zgrep-f test-zgrep-signal test-znew-k test-z-suffix 
 
 test-%: zstd
-       @./test-driver.sh --test-name $* --log-file $*.log --trs-file $*.trs --expect-failure "no" --color-tests "yes" --enable-hard-errors "yes" ./$*.sh
+       @./test-driver.sh --test-name $* --log-file $*.log --trs-file $*.trs --expect-failure "no" --color-tests "yes" --enable-hard-errors "yes" ./$*.sh 
+       # || echo ignoring error
 
 endif

diff --git a/tests/gzip/gzip-env.sh b/tests/gzip/gzip-env.sh
index 873d716dca5015764dd1b2e3941049330b787fd4..f15a8d476a3644268242142c85243633a268974c 100755 (executable)
--- a/tests/gzip/gzip-env.sh
+++ b/tests/gzip/gzip-env.sh
@@ -17,7 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+echo XXX=$PATH
+gzip --version
+
+. "${srcdir=.}/init.sh"; path_prepend_ .
+
+echo XXX=$PATH
+gzip --version
 
 echo a >exp || framework_failure_
 gzip <exp >in || framework_failure_

diff --git a/tests/gzip/helin-segv.sh b/tests/gzip/helin-segv.sh
index 0182db33d1f0fecc0e28e5642d16b0ce2c2a22fc..f182c8066f342d8ffda9d9b9496c5cd8607e7896 100644 (file)
--- a/tests/gzip/helin-segv.sh
+++ b/tests/gzip/helin-segv.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 # This test case was provided by Aki Helin.
 printf '\037\235\220\0\0\0\304' > helin.gz || framework_failure_

diff --git a/tests/gzip/help-version.sh b/tests/gzip/help-version.sh
index 5af9a0509eba1b8fbab3121129a35ee3c6f2e136..ee0c19f7d1fc3a166c1a8c9cf3e3736b1401cfd7 100644 (file)
--- a/tests/gzip/help-version.sh
+++ b/tests/gzip/help-version.sh
@@ -23,7 +23,7 @@
 test "x$SHELL" = x && SHELL=/bin/sh
 export SHELL
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 expected_failure_status_chroot=125
 expected_failure_status_env=125

diff --git a/tests/gzip/hufts.sh b/tests/gzip/hufts.sh
index 5832a21845455402498530aeaa4b16fff87ba011..9b9576ce34e54c6c32dd539343b584da3da6f5eb 100644 (file)
--- a/tests/gzip/hufts.sh
+++ b/tests/gzip/hufts.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 printf '\n...: invalid compressed data--format violated\n' > exp \
   || framework_failure_

diff --git a/tests/gzip/keep.sh b/tests/gzip/keep.sh
index 105d43e643d015655f7a779d43b942a189a80b45..ab9a21811d31253e4306811cf5a6b2a9e04d02bf 100644 (file)
--- a/tests/gzip/keep.sh
+++ b/tests/gzip/keep.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 echo fooooooooo > in || framework_failure_
 cp in orig || framework_failure_

diff --git a/tests/gzip/list.sh b/tests/gzip/list.sh
index 7576dc3a8cc1ba7536e971fd023c1788c68dce51..75912e1e26d7ee2cf58f239e0646172a1053b986 100644 (file)
--- a/tests/gzip/list.sh
+++ b/tests/gzip/list.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 echo zoology zucchini > in || framework_failure_
 cp in orig || framework_failure_

diff --git a/tests/gzip/memcpy-abuse.sh b/tests/gzip/memcpy-abuse.sh
index 970b885235d20f7b8dc6c3fa0faf4990c648a243..7d5c056debc6bbcee3a533ea4ba7b4aa70a5b828 100644 (file)
--- a/tests/gzip/memcpy-abuse.sh
+++ b/tests/gzip/memcpy-abuse.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 # The input must be larger than 32KiB and slightly
 # less uniform than e.g., all zeros.

diff --git a/tests/gzip/mixed.sh b/tests/gzip/mixed.sh
index 50e2537a2c9f6784fc5ca189ff0e2097e77fbd48..383a54f5e46ec7f0eded116af2db924cf4fe6dfd 100644 (file)
--- a/tests/gzip/mixed.sh
+++ b/tests/gzip/mixed.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 printf 'xxx\nyyy\n'      > exp2 || framework_failure_
 printf 'aaa\nbbb\nccc\n' > exp3 || framework_failure_

diff --git a/tests/gzip/null-suffix-clobber.sh b/tests/gzip/null-suffix-clobber.sh
index 903864ce641586da7de40d0b07e87a08cd1b65fb..0efd0e3449085ca2fd042c331cf71a802d82a1a1 100644 (file)
--- a/tests/gzip/null-suffix-clobber.sh
+++ b/tests/gzip/null-suffix-clobber.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 printf anything | gzip > F.gz || framework_failure_
 echo y > yes || framework_failure_

diff --git a/tests/gzip/stdin.sh b/tests/gzip/stdin.sh
index 190687f9696c7741d2e30e687c042a999e72b56e..eef4cd8b10780dfb492784e780b8276567dee032 100644 (file)
--- a/tests/gzip/stdin.sh
+++ b/tests/gzip/stdin.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 printf a | gzip > in || framework_failure_
 printf aaa > exp || framework_failure_

diff --git a/tests/gzip/trailing-nul.sh b/tests/gzip/trailing-nul.sh
index b21f76fdcf067052f4baaeb3eb4a538f87e83bdb..7b15d5e5578819b1073190d65b7abccd7ddf334b 100644 (file)
--- a/tests/gzip/trailing-nul.sh
+++ b/tests/gzip/trailing-nul.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 (echo 0 | gzip; printf '\0') > 0.gz || framework_failure_
 (echo 00 | gzip; printf '\0\0') > 00.gz || framework_failure_

diff --git a/tests/gzip/unpack-invalid.sh b/tests/gzip/unpack-invalid.sh
index acea97e83b75d4df9f133f9d1140c27157f4a2a5..fe8384d73cde66be5fa29edf6cc09b1cdcaa8767 100644 (file)
--- a/tests/gzip/unpack-invalid.sh
+++ b/tests/gzip/unpack-invalid.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 for input in \
   '\037\036\000\000\037\213\010\000\000\000\000\000\002\003\036\000\000\000\002\003\037\213\010\000\000\000\000\000\002\003\355\301\001\015\000\000\000\302\240\037\000\302\240\037\213\010\000\000\000\000\000\002\003\355\301' \

diff --git a/tests/gzip/z-suffix.sh b/tests/gzip/z-suffix.sh
index 470932060c006a9804d2714815109878ce78e6bc..a870a5408de0136a2617be409ec524ad116cc12b 100644 (file)
--- a/tests/gzip/z-suffix.sh
+++ b/tests/gzip/z-suffix.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 printf anything > F && cp F G || framework_failure_
 gzip -Sz F || fail=1

diff --git a/tests/gzip/zdiff.sh b/tests/gzip/zdiff.sh
index 0bb7c7dfdcf93ecd2614521a941a962871465907..d62a84606ba4edfe545c4406f326b8a00394e195 100644 (file)
--- a/tests/gzip/zdiff.sh
+++ b/tests/gzip/zdiff.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 echo a > a || framework_failure_
 echo b > b || framework_failure_

diff --git a/tests/gzip/zgrep-context.sh b/tests/gzip/zgrep-context.sh
index 089d2563971dd6f06bd0eb0a41176bfd0ccae71b..c8648b7e4f554ce96f56512c5b073ccc081c3885 100644 (file)
--- a/tests/gzip/zgrep-context.sh
+++ b/tests/gzip/zgrep-context.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 # A limited replacement for seq: handle 1 or 2 args; increment must be 1
 seq()

diff --git a/tests/gzip/zgrep-f.sh b/tests/gzip/zgrep-f.sh
index 1ce8cc293f260659396d71b39a25c492979fe96f..d0cf27f7e23129d2c95299f55dad20a20354b782 100644 (file)
--- a/tests/gzip/zgrep-f.sh
+++ b/tests/gzip/zgrep-f.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 printf 'needle\nn2\n' > n || framework_failure_
 cp n haystack || framework_failure_

diff --git a/tests/gzip/zgrep-signal.sh b/tests/gzip/zgrep-signal.sh
index 13783ef1001cecacbfb087b12cce643867e2e71c..a8c53881adde1397a7546bde79bf48c1aebf800b 100644 (file)
--- a/tests/gzip/zgrep-signal.sh
+++ b/tests/gzip/zgrep-signal.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 echo a | gzip -c > f.gz || framework_failure_
 

diff --git a/tests/gzip/znew-k.sh b/tests/gzip/znew-k.sh
index 98e7fa1f8e3553284fb2510e42d1bb5c8bafb9ae..6c239e28ea8fa795d7c456f1aac80c8eb3baed3d 100644 (file)
--- a/tests/gzip/znew-k.sh
+++ b/tests/gzip/znew-k.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-. "${srcdir=.}/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ .
 
 cat <<'EOF' >compress || framework_failure_
 #!/bin/sh