From: Jim Meyering Date: Wed, 7 Apr 2010 06:16:51 +0000 (+0200) Subject: tests: pull help-version from grep X-Git-Tag: v1.5~80 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a8971841f3b001d2428dbdf9119ab5d2956b6832;p=debian%2Fgzip tests: pull help-version from grep --- diff --git a/tests/help-version b/tests/help-version index 79f4b57..3c865fb 100755 --- a/tests/help-version +++ b/tests/help-version @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -test "$VERBOSE" = yes && set -x - # Ensure that $SHELL is set to *some* value and exported. # This is required for dircolors, which would fail e.g., when # invoked via debuild (which removes SHELL from the environment). @@ -54,6 +52,10 @@ expected_failure_status_zgrep=2 expected_failure_status_zegrep=2 expected_failure_status_zfgrep=2 +expected_failure_status_grep=2 +expected_failure_status_egrep=2 +expected_failure_status_fgrep=2 + test "$built_programs" \ || { echo "$this_test: no programs built!?!" 1>&2; Exit 1; } @@ -112,102 +114,111 @@ tmp_out=out-$$ mkdir $tmp || fail=1 cd $tmp || fail=1 -comm_args="$tmp_in $tmp_in" -csplit_args="$tmp_in //" -cut_args='-f 1' -join_args="$tmp_in $tmp_in" -tr_args='a a' +comm_setup () { args="$tmp_in $tmp_in"; } +csplit_setup () { args="$tmp_in //"; } +cut_setup () { args='-f 1'; } +join_setup () { args="$tmp_in $tmp_in"; } +tr_setup () { args='a a'; } -chmod_args="a+x $tmp_in" +chmod_setup () { args="a+x $tmp_in"; } # Punt on these. -chgrp_args=--version -chown_args=--version -mkfifo_args=--version -mknod_args=--version +chgrp_setup () { args=--version; } +chown_setup () { args=--version; } +mkfifo_setup () { args=--version; } +mknod_setup () { args=--version; } # Punt on uptime, since it fails (e.g., failing to get boot time) # on some systems, and we shouldn't let that stop `make check'. -uptime_args=--version +uptime_setup () { args=--version; } # Create a file in the current directory, not in $TMPDIR. -mktemp_args=mktemp.XXXX +mktemp_setup () { args=mktemp.XXXX; } -cmp_args="$tmp_in $tmp_in2" +cmp_setup () { args="$tmp_in $tmp_in2"; } # Tell dd not to print the line with transfer rate and total. # The transfer rate would vary between runs. -dd_args=status=noxfer - -zdiff_args="$zin $zin2" -zcmp_args="$zin $zin2" -zcat_args=$zin -gunzip_args=$zin -zmore_args=$zin -zless_args=$zin -znew_args=$bigZ_in -zforce_args=$zin -zgrep_args="z $zin" -zegrep_args="z $zin" -zfgrep_args="z $zin" -gzexe_args=$tmp_in - -diff_args="$tmp_in $tmp_in2" -sdiff_args="$tmp_in $tmp_in2" -diff3_args="$tmp_in $tmp_in2 $tmp_in2" -cp_args="$tmp_in $tmp_in2" -ln_args="$tmp_in ln-target" -ginstall_args="$tmp_in $tmp_in2" -mv_args="$tmp_in $tmp_in2" -mkdir_args=$tmp_dir/subdir -rmdir_args=$tmp_dir -rm_args=$tmp_in -shred_args=$tmp_in -touch_args=$tmp_in2 -truncate_args="--reference=$tmp_in $tmp_in2" - -basename_args=$tmp_in -dirname_args=$tmp_in -expr_args=foo +dd_setup () { args=status=noxfer; } + +zdiff_setup () { args="$zin $zin2"; } +zcmp_setup () { args="$zin $zin2"; } +zcat_setup () { args=$zin; } +gunzip_setup () { args=$zin; } +zmore_setup () { args=$zin; } +zless_setup () { args=$zin; } +znew_setup () { args=$bigZ_in; } +zforce_setup () { args=$zin; } +zgrep_setup () { args="z $zin"; } +zegrep_setup () { args="z $zin"; } +zfgrep_setup () { args="z $zin"; } +gzexe_setup () { args=$tmp_in; } + +# We know that $tmp_in contains a "0" +grep_setup () { args="0 $tmp_in"; } +egrep_setup () { args="0 $tmp_in"; } +fgrep_setup () { args="0 $tmp_in"; } + +diff_setup () { args="$tmp_in $tmp_in2"; } +sdiff_setup () { args="$tmp_in $tmp_in2"; } +diff3_setup () { args="$tmp_in $tmp_in2 $tmp_in2"; } +cp_setup () { args="$tmp_in $tmp_in2"; } +ln_setup () { args="$tmp_in ln-target"; } +ginstall_setup () { args="$tmp_in $tmp_in2"; } +mv_setup () { args="$tmp_in $tmp_in2"; } +mkdir_setup () { args=$tmp_dir/subdir; } +rmdir_setup () { args=$tmp_dir; } +rm_setup () { args=$tmp_in; } +shred_setup () { args=$tmp_in; } +touch_setup () { args=$tmp_in2; } +truncate_setup () { args="--reference=$tmp_in $tmp_in2"; } + +basename_setup () { args=$tmp_in; } +dirname_setup () { args=$tmp_in; } +expr_setup () { args=foo; } # Punt, in case GNU `id' hasn't been installed yet. -groups_args=--version - -pathchk_args=$tmp_in -yes_args=--version -logname_args=--version -nohup_args=--version -printf_args=foo -seq_args=10 -sleep_args=0 -su_args=--version -stdbuf_args="-oL true" -timeout_args=--version +groups_setup () { args=--version; } + +pathchk_setup () { args=$tmp_in; } +yes_setup () { args=--version; } +logname_setup () { args=--version; } +nohup_setup () { args=--version; } +printf_setup () { args=foo; } +seq_setup () { args=10; } +sleep_setup () { args=0; } +su_setup () { args=--version; } +stdbuf_setup () { args="-oL true"; } +timeout_setup () { args=--version; } # I'd rather not run sync, since it spins up disks that I've # deliberately caused to spin down (but not unmounted). -sync_args=--version +sync_setup () { args=--version; } -test_args=foo +test_setup () { args=foo; } # This is necessary in the unusual event that there is # no valid entry in /etc/mtab. -df_args=/ +df_setup () { args=/; } # This is necessary in the unusual event that getpwuid (getuid ()) fails. -id_args=-u +id_setup () { args=-u; } # Use env to avoid invoking built-in sleep of Solaris 11's /bin/sh. -env sleep 10m & -kill_args=$! +kill_setup () { + env sleep 10m & + args=$! +} -link_args="$tmp_in link-target" -unlink_args=$tmp_in +link_setup () { args="$tmp_in link-target"; } +unlink_setup () { args=$tmp_in; } -ln -s . slink -readlink_args=slink +readlink_setup () { + ln -s . slink + args=slink; +} -stat_args=$tmp_in -unlink_args=$tmp_in -lbracket_args=": ]" +stat_setup () { args=$tmp_in; } +unlink_setup () { args=$tmp_in; } +lbracket_setup () { args=": ]"; } # Ensure that each program "works" (exits successfully) when doing # something more than --help or --version. @@ -219,12 +230,21 @@ for i in $built_programs; do echo z |gzip > $zin cp $zin $zin2 cp $zin $bigZ_in - echo > $tmp_in - echo > $tmp_in2 + + # This is sort of kludgey: use numbers so this is valid input for factor, + # and two tokens so it's valid input for tsort. + echo 2147483647 0 > $tmp_in + # Make $tmp_in2 identical. Then, using $tmp_in and $tmp_in2 as arguments + # to the likes of cmp and diff makes them exit successfully. + cp $tmp_in $tmp_in2 mkdir $tmp_dir # echo ================== $i test $i = [ && prog=lbracket || prog=$i - eval "args=\$${prog}_args" + if type ${prog}_setup > /dev/null 2>&1; then + ${prog}_setup + else + args= + fi if env $i $args < $tmp_in > $tmp_out; then : # ok else