mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
Consolidate od tests.
* tests/misc/od: Perform od-zero-len's test here. Include boilerplate code, so tests run in a subdirectory. * tests/misc/od-zero-len: Remove this file.
This commit is contained in:
1 parent
e069d38d35
commit
d2e5e366a1
3 files changed
+42
-54
No files matched your search
@@ -1,5 +1,10 @@
|
||||
2007-08-16 Jim Meyering <jim@meyering.net>
|
||||
|
||||
Consolidate od tests.
|
||||
* tests/misc/od: Perform od-zero-len's test here.
|
||||
Include boilerplate code, so tests run in a subdirectory.
|
||||
* tests/misc/od-zero-len: Remove this file.
|
||||
|
||||
* tests/ls/time-1: Include sample-test boilerplate code.
|
||||
Remove the then-unnecessary, hard-coded envvar "unset" commands.
|
||||
|
||||
|
||||
+37
-1
@@ -20,6 +20,20 @@
|
||||
: ${PERL=perl}
|
||||
: ${srcdir=.}
|
||||
|
||||
pwd=`pwd`
|
||||
t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
|
||||
trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
|
||||
trap '(exit $?); exit $?' 1 2 13 15
|
||||
|
||||
framework_failure=0
|
||||
mkdir -p $tmp || framework_failure=1
|
||||
cd $tmp || framework_failure=1
|
||||
|
||||
if test $framework_failure = 1; then
|
||||
echo "$0: failure in testing framework" 1>&2
|
||||
(exit 1); exit 1
|
||||
fi
|
||||
|
||||
PROG=`echo $0|sed 's,.*/,,'`; export PROG
|
||||
|
||||
$PERL -e 1 > /dev/null 2>&1 || {
|
||||
@@ -28,7 +42,7 @@ $PERL -e 1 > /dev/null 2>&1 || {
|
||||
exit 77
|
||||
}
|
||||
|
||||
exec $PERL -w -I$srcdir/.. -MCoreutils -- - <<\EOF
|
||||
exec $PERL -w -I$pwd/.. -MCoreutils -- - <<\EOF
|
||||
require 5.003;
|
||||
use strict;
|
||||
|
||||
@@ -37,6 +51,23 @@ use strict;
|
||||
# Turn off localisation of executable's ouput.
|
||||
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
|
||||
|
||||
# Use a file in /proc whose size is not likely to
|
||||
# change between the wc and od invocations.
|
||||
my $proc_file = '/proc/version';
|
||||
-f $proc_file
|
||||
or $proc_file = '/dev/null';
|
||||
|
||||
# Count the bytes in $proc_file, _by reading_.
|
||||
my $len = 0;
|
||||
open FH, '<', $proc_file
|
||||
or die "$program_name: can't open `$proc_file' for reading: $!\n";
|
||||
while (defined (my $line = <FH>))
|
||||
{
|
||||
$len += length $line;
|
||||
}
|
||||
close FH;
|
||||
my $proc_file_byte_count = $len;
|
||||
|
||||
my @Tests =
|
||||
(
|
||||
# Skip the exact length of the input file.
|
||||
@@ -49,6 +80,11 @@ my @Tests =
|
||||
# Skip the sum of the lengths of the first three inputs, printing the 4th.
|
||||
['j-bug4', '-c -j 3 -An', {IN=>{g=>'a'}}, {IN=>{h=>'b'}},
|
||||
{IN=>{i=>'c'}}, {IN=>{j=>'d'}}, {OUT=>" d\n"}],
|
||||
|
||||
# Ensure that od -j doesn't fseek across a nonempty file in /proc,
|
||||
# even if the kernel reports that the file has stat.st_size = 0.
|
||||
['j-proc', "-An -c -j $proc_file_byte_count $proc_file",
|
||||
{IN=>{f2=>'e'}}, {OUT=>" e\n"}],
|
||||
);
|
||||
|
||||
my $save_temps = $ENV{DEBUG};
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
#!/bin/sh
|
||||
# ensure that od -j doesn't improperly fseek across a nonempty file in /proc
|
||||
|
||||
# Copyright (C) 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
if test "$VERBOSE" = yes; then
|
||||
set -x
|
||||
od --version
|
||||
fi
|
||||
|
||||
pwd=`pwd`
|
||||
t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
|
||||
trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
|
||||
trap '(exit $?); exit $?' 1 2 13 15
|
||||
|
||||
framework_failure=0
|
||||
mkdir -p $tmp || framework_failure=1
|
||||
cd $tmp || framework_failure=1
|
||||
printf e > f2 || framework_failure=1
|
||||
|
||||
if test $framework_failure = 1; then
|
||||
echo "$0: failure in testing framework" 1>&2
|
||||
(exit 1); exit 1
|
||||
fi
|
||||
|
||||
# Use a file in /proc whose size is not likely to
|
||||
# change between the wc and od invocations.
|
||||
f=/proc/version
|
||||
test -r $f || f=empty
|
||||
|
||||
fail=0
|
||||
|
||||
n=`wc -c < $f` || fail=1
|
||||
od -An -c -j $n $f f2 > out || fail=1
|
||||
echo ' e' > exp || fail=1
|
||||
|
||||
cmp out exp || fail=1
|
||||
test $fail = 1 && diff out exp 2> /dev/null
|
||||
|
||||
(exit $fail); exit $fail
|
||||
Reference in new issue
Block a user