X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tests%2Fhelp-version;fp=tests%2Fhelp-version;h=5af9a0509eba1b8fbab3121129a35ee3c6f2e136;hb=20fcfc81ece044b8b0a6768ec6cf47be4e22a2e6;hp=ce5838b5402e1b1b85c3be96d6c9e071847423fd;hpb=d57728a6ca2413a7c564d8b7bb13d9e5a5a180f3;p=debian%2Fgzip

diff --git a/tests/help-version b/tests/help-version
index ce5838b..5af9a05 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -2,7 +2,7 @@
 # Make sure all these programs work properly
 # when invoked with --help or --version.
 
-# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# Copyright (C) 2000-2016 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,19 +55,6 @@ expected_failure_status_grep=2
 expected_failure_status_egrep=2
 expected_failure_status_fgrep=2
 
-gunzip_setuphelp () { args="--__bindir '$abs_top_builddir'"; }
-gzexe_setuphelp () { gunzip_setuphelp; }
-zcat_setuphelp () { gunzip_setuphelp; }
-zcmp_setuphelp () { gunzip_setuphelp; }
-zdiff_setuphelp () { gunzip_setuphelp; }
-zegrep_setuphelp () { gunzip_setuphelp; }
-zfgrep_setuphelp () { gunzip_setuphelp; }
-zforce_setuphelp () { gunzip_setuphelp; }
-zgrep_setuphelp () { gunzip_setuphelp; }
-zless_setuphelp () { gunzip_setuphelp; }
-zmore_setuphelp () { gunzip_setuphelp; }
-znew_setuphelp () { gunzip_setuphelp; }
-
 test "$built_programs" \
   || fail_ "built_programs not specified!?!"
 
@@ -97,11 +84,7 @@ for lang in C fr da; do
       continue
     fi
 
-    if type ${i}_setuphelp > /dev/null 2>&1; then
-      ${i}_setuphelp
-    else
-      args=
-    fi
+    args=
 
     # The just-built install executable is always named `ginstall'.
     test $i = install && i=ginstall
@@ -170,18 +153,18 @@ cmp_setup () { args="$tmp_in $tmp_in2"; }
 # The transfer rate would vary between runs.
 dd_setup () { args=status=noxfer; }
 
-zdiff_setup () { gunzip_setuphelp; args="$args $zin $zin2"; }
+zdiff_setup () { args="$args $zin $zin2"; }
 zcmp_setup () { zdiff_setup; }
-zcat_setup () { gunzip_setuphelp; args="$args $zin"; }
+zcat_setup () { args="$args $zin"; }
 gunzip_setup () { zcat_setup; }
 zmore_setup () { zcat_setup; }
 zless_setup () { zcat_setup; }
-znew_setup () { gunzip_setuphelp; args="$args $bigZ_in"; }
+znew_setup () { args="$args $bigZ_in"; }
 zforce_setup () { zcat_setup; }
-zgrep_setup () { gunzip_setuphelp; args="$args z $zin"; }
+zgrep_setup () { args="$args z $zin"; }
 zegrep_setup () { zgrep_setup; }
 zfgrep_setup () { zgrep_setup; }
-gzexe_setup () { gunzip_setuphelp; args="$args $tmp_in"; }
+gzexe_setup () { args="$args $tmp_in"; }
 
 # We know that $tmp_in contains a "0"
 grep_setup () { args="0 $tmp_in"; }
@@ -271,10 +254,9 @@ for i in $built_programs; do
   mkdir $tmp_dir
   # echo ================== $i
   test $i = [ && prog=lbracket || prog=$i
+  args=
   if type ${prog}_setup > /dev/null 2>&1; then
     ${prog}_setup
-  else
-    args=
   fi
   if eval "env \$i $args < \$tmp_in > \$tmp_out"; then
     : # ok