From 570fd054c62fb5982e92f2d03c6397b4c3e2a207 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 8 Sep 2007 15:51:25 +0200 Subject: Move the two tests in tests/md5sum to tests/misc/md5sum. * tests/md5sum/basic-1: Move this file to ... * tests/misc/md5sum: ...here. Don't rely on $PROG in env. * tests/md5sum/newline-1: Move this file to ... * tests/misc/md5sum-newline: ...here. Don't rely on $PROG in env. * tests/misc/Makefile.am (TESTS): Add md5sum. * tests/Makefile.am (SUBDIRS): Remove md5sum. * tests/md5sum: Remove the directory. * configure.ac (AC_CONFIG_FILES): Remove tests/md5sum/Makefile --- tests/Makefile.am | 2 +- tests/md5sum/Makefile.am | 13 ------- tests/md5sum/basic-1 | 88 ----------------------------------------------- tests/md5sum/newline-1 | 68 ------------------------------------ tests/misc/Makefile.am | 2 ++ tests/misc/md5sum | 88 +++++++++++++++++++++++++++++++++++++++++++++++ tests/misc/md5sum-newline | 68 ++++++++++++++++++++++++++++++++++++ 7 files changed, 159 insertions(+), 170 deletions(-) delete mode 100644 tests/md5sum/Makefile.am delete mode 100755 tests/md5sum/basic-1 delete mode 100755 tests/md5sum/newline-1 create mode 100755 tests/misc/md5sum create mode 100755 tests/misc/md5sum-newline (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index be36fb87a..1984235b6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -45,7 +45,7 @@ EXTRA_DIST = \ ## There are too many already. Put new tests in misc/. SUBDIRS = \ chgrp chmod chown cp cut dd du head \ - install join ln ls ls-2 md5sum misc mkdir mv od pr readlink rm rmdir \ + install join ln ls ls-2 misc mkdir mv od pr readlink rm rmdir \ seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \ tsort unexpand uniq wc ## N O T E :: Please do not add new directories. diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am deleted file mode 100644 index 0ed74e035..000000000 --- a/tests/md5sum/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. - -EXTRA_DIST = $(TESTS) - -TESTS_ENVIRONMENT = \ - top_srcdir=$(top_srcdir) \ - srcdir=$(srcdir) \ - PERL="$(PERL)" \ - CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \ - PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \ - PROG=md5sum - -TESTS = basic-1 newline-1 diff --git a/tests/md5sum/basic-1 b/tests/md5sum/basic-1 deleted file mode 100755 index 7b56e64f7..000000000 --- a/tests/md5sum/basic-1 +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# Basic tests for "md5sum". - -# Copyright (C) 1998, 1999, 2003, 2005 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -: ${PERL=perl} -: ${srcdir=.} - -$PERL -e 1 > /dev/null 2>&1 || { - echo 1>&2 "$0: configure didn't find a usable version of Perl," \ - "so can't run this test" - exit 77 -} - -me=`echo $0|sed 's,.*/,,'` -exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF -require 5.003; -use strict; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localisation of executable's ouput. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; - -my @Tests = - ( - ['1', {IN=> {f=> ''}}, {OUT=>"$degenerate f\n"}], - ['2', {IN=> {f=> 'a'}}, {OUT=>"0cc175b9c0f1b6a831c399e269772661 f\n"}], - ['3', {IN=> {f=> 'abc'}}, {OUT=>"900150983cd24fb0d6963f7d28e17f72 f\n"}], - ['4', {IN=> {f=> 'message digest'}}, - {OUT=>"f96b697d7cb7938d525a2f31aaf161d0 f\n"}], - ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, - {OUT=>"c3fcd3d76192e4007dfb496cca67e13b f\n"}], - ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, - {OUT=>"d174ab98d277d9f5a5611c2c9f419d9f f\n"}], - ['7', {IN=> {f=> '1234567890' x 8}}, - {OUT=>"57edf4a22be3c955ac49da2e2107b67a f\n"}], - ['backslash', {IN=> {".\\foo"=> ''}}, - {OUT=>"\\$degenerate .\\\\foo\n"}], - ['check-1', '--check', {AUX=> {f=> ''}}, - {IN=> {'f.md5' => "$degenerate f\n"}}, - {OUT=>"f: OK\n"}], - ['check-2', '--check', '--status', {IN=>{'f.md5' => "$degenerate f\n"}}, - {AUX=> {f=> 'foo'}}, {EXIT=> 1}], - # The sha1sum and md5sum drivers share a lot of code. - # Ensure that md5sum does *not* share the part that makes - # sha1sum accept BSD format. - ['check-bsd', '--check', {IN=> {'f.sha1' => "SHA1 (f) = $degenerate\n"}}, - {AUX=> {f=> ''}}, - {ERR=>"md5sum: f.sha1: no properly formatted " - . "MD5 checksum lines found\n"}, - {EXIT=> 1}], - ['check-bsd2', '--check', {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, - {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], - ['check-bsd3', '--check', '--status', - {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, - {AUX=> {f=> 'bar'}}, {EXIT=> 1}], - ); - -# Insert the `--text' argument for each test. -my $t; -foreach $t (@Tests) - { - splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; - } - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; -EOF diff --git a/tests/md5sum/newline-1 b/tests/md5sum/newline-1 deleted file mode 100755 index 5e16b9c90..000000000 --- a/tests/md5sum/newline-1 +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# Newline tests for "md5sum". - -# Copyright (C) 1999, 2000, 2003, 2005 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -: ${PERL=perl} -: ${srcdir=.} - -$PERL -e 1 > /dev/null 2>&1 || { - echo 1>&2 "$0: configure didn't find a usable version of Perl," \ - "so can't run this test" - exit 77 -} - -# See if we can create a filename that contains a newline. -# Be careful to do it in a subshell so that we can redirect the -# error output if it fails. -(> 'a -b') 2> /dev/null \ - && filename_may_contain_newline=yes \ - || filename_may_contain_newline=no -rm -f 'a -b' - -if test $filename_may_contain_newline = no; then - echo 1>&2 "$0: can't create newline-containing file name," \ - "so can't run this test" - exit 77 -fi - -me=`echo $0|sed 's,.*/,,'` -exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF -require 5.003; -use strict; - -(my $program_name = $0) =~ s|.*/||; - -# Turn off localisation of executable's ouput. -@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; -my $t = '--text'; - -my @Tests = - ( - ['newline', $t, {IN=> {"a\nb"=> ''}}, {OUT=>"\\$degenerate a\\nb\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; -EOF diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index faf9e49da..1d5334e19 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -75,6 +75,8 @@ TESTS = \ groups-version \ head-c \ head-pos \ + md5sum \ + md5sum-newline \ mknod \ nice \ nl \ diff --git a/tests/misc/md5sum b/tests/misc/md5sum new file mode 100755 index 000000000..43407a40e --- /dev/null +++ b/tests/misc/md5sum @@ -0,0 +1,88 @@ +#!/bin/sh +# Basic tests for "md5sum". + +# Copyright (C) 1998, 1999, 2003, 2005, 2007 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +: ${PERL=perl} +: ${srcdir=.} + +$PERL -e 1 > /dev/null 2>&1 || { + echo 1>&2 "$0: configure didn't find a usable version of Perl," \ + "so can't run this test" + exit 77 +} + +me=`echo $0|sed 's,.*/,,'` +exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF +require 5.003; +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localisation of executable's ouput. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; + +my @Tests = + ( + ['1', {IN=> {f=> ''}}, {OUT=>"$degenerate f\n"}], + ['2', {IN=> {f=> 'a'}}, {OUT=>"0cc175b9c0f1b6a831c399e269772661 f\n"}], + ['3', {IN=> {f=> 'abc'}}, {OUT=>"900150983cd24fb0d6963f7d28e17f72 f\n"}], + ['4', {IN=> {f=> 'message digest'}}, + {OUT=>"f96b697d7cb7938d525a2f31aaf161d0 f\n"}], + ['5', {IN=> {f=> 'abcdefghijklmnopqrstuvwxyz'}}, + {OUT=>"c3fcd3d76192e4007dfb496cca67e13b f\n"}], + ['6', {IN=> {f=> join ('', 'A'..'Z', 'a'..'z', '0'..'9')}}, + {OUT=>"d174ab98d277d9f5a5611c2c9f419d9f f\n"}], + ['7', {IN=> {f=> '1234567890' x 8}}, + {OUT=>"57edf4a22be3c955ac49da2e2107b67a f\n"}], + ['backslash', {IN=> {".\\foo"=> ''}}, + {OUT=>"\\$degenerate .\\\\foo\n"}], + ['check-1', '--check', {AUX=> {f=> ''}}, + {IN=> {'f.md5' => "$degenerate f\n"}}, + {OUT=>"f: OK\n"}], + ['check-2', '--check', '--status', {IN=>{'f.md5' => "$degenerate f\n"}}, + {AUX=> {f=> 'foo'}}, {EXIT=> 1}], + # The sha1sum and md5sum drivers share a lot of code. + # Ensure that md5sum does *not* share the part that makes + # sha1sum accept BSD format. + ['check-bsd', '--check', {IN=> {'f.sha1' => "SHA1 (f) = $degenerate\n"}}, + {AUX=> {f=> ''}}, + {ERR=>"md5sum: f.sha1: no properly formatted " + . "MD5 checksum lines found\n"}, + {EXIT=> 1}], + ['check-bsd2', '--check', {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, + {AUX=> {f=> ''}}, {OUT=>"f: OK\n"}], + ['check-bsd3', '--check', '--status', + {IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}}, + {AUX=> {f=> 'bar'}}, {EXIT=> 1}], + ); + +# Insert the `--text' argument for each test. +my $t; +foreach $t (@Tests) + { + splice @$t, 1, 0, '--text' unless @$t[1] =~ /--check/; + } + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'md5sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; +EOF diff --git a/tests/misc/md5sum-newline b/tests/misc/md5sum-newline new file mode 100755 index 000000000..22717d41e --- /dev/null +++ b/tests/misc/md5sum-newline @@ -0,0 +1,68 @@ +#!/bin/sh +# Newline tests for "md5sum". + +# Copyright (C) 1999, 2000, 2003, 2005, 2007 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +: ${PERL=perl} +: ${srcdir=.} + +$PERL -e 1 > /dev/null 2>&1 || { + echo 1>&2 "$0: configure didn't find a usable version of Perl," \ + "so can't run this test" + exit 77 +} + +# See if we can create a filename that contains a newline. +# Be careful to do it in a subshell so that we can redirect the +# error output if it fails. +(> 'a +b') 2> /dev/null \ + && filename_may_contain_newline=yes \ + || filename_may_contain_newline=no +rm -f 'a +b' + +if test $filename_may_contain_newline = no; then + echo 1>&2 "$0: can't create newline-containing file name," \ + "so can't run this test" + exit 77 +fi + +me=`echo $0|sed 's,.*/,,'` +exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF +require 5.003; +use strict; + +(my $program_name = $0) =~ s|.*/||; + +# Turn off localisation of executable's ouput. +@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + +my $degenerate = "d41d8cd98f00b204e9800998ecf8427e"; +my $t = '--text'; + +my @Tests = + ( + ['newline', $t, {IN=> {"a\nb"=> ''}}, {OUT=>"\\$degenerate a\\nb\n"}], + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'md5sum'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; +EOF -- cgit v1.2.3-54-g00ecf