From: Michael G. Schwern Date: Tue, 4 Dec 2001 23:40:10 +0000 (-0500) Subject: Re: [PATCH t/op/stat.t t/test.pl] stat.t cleanup, first pass X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cc25fa79f0d20e45d56da14d4ae1a54a2370b6d6;p=p5sagit%2Fp5-mst-13.2.git Re: [PATCH t/op/stat.t t/test.pl] stat.t cleanup, first pass Message-ID: <20011204234010.B14333@blackrider> p4raw-id: //depot/perl@13469 --- diff --git a/t/op/stat.t b/t/op/stat.t index 5711236..e60d410 100755 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -1,287 +1,319 @@ #!./perl -# $RCSfile: stat.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:28 $ - BEGIN { chdir 't' if -d 't'; @INC = '../lib'; + require './test.pl'; } use Config; -print "1..59\n"; +plan tests => 63; +$Is_Amiga = $^O eq 'amigaos'; +$Is_Cygwin = $^O eq 'cygwin'; +$Is_Dos = $^O eq 'dos'; +$Is_MPE = $^O eq 'mpeix'; $Is_MSWin32 = $^O eq 'MSWin32'; $Is_NetWare = $^O eq 'NetWare'; -$Is_Dos = $^O eq 'dos'; -$Is_Cygwin = $^O eq 'cygwin'; -$Is_MPE = $^O eq 'mpeix'; -$Is_Dosish = $Is_Dos || $^O eq 'os2' || $Is_MSWin32 || $Is_NetWare || $Is_Cygwin; +$Is_OS2 = $^O eq 'os2'; +$Is_Solaris = $^O eq 'solaris'; + +$Is_Dosish = $Is_Dos || $Is_OS2 || $Is_MSWin32 || $Is_NetWare || $Is_Cygwin; chop($cwd = (($Is_MSWin32 || $Is_NetWare) ? `cd` : `pwd`)); -$DEV = `ls -l /dev` unless $Is_Dosish or $Is_Cygwin; +$Dev_list = `ls -l /dev` unless $Is_Dosish or $Is_Cygwin; + +my($DEV, $INO, $MODE, $NLINK, $UID, $GID, $RDEV, $SIZE, + $ATIME, $MTIME, $CTIME, $BLKSIZE, $BLOCKS) = (0..12); -unlink "Op.stat.tmp"; -if (open(FOO, ">Op.stat.tmp")) { - # hack to make Apollo update link count: - $junk = `ls Op.stat.tmp` unless ($Is_MSWin32 || $Is_NetWare || $Is_Dos); - ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime, - $blksize,$blocks) = stat(FOO); - if ($nlink == 1) { - print "ok 1\n"; - } - else { - print "# res=$res, nlink=$nlink.\nnot ok 1\n"; - } - if ($Is_MSWin32 or $Is_NetWare or $Is_Cygwin or $Is_Dos || ($mtime && $mtime == $ctime)) { - print "ok 2\n"; - } - else { - print "# |$mtime| vs |$ctime|\nnot ok 2\n"; - } +my $tmpfile = 'Op.stat.tmp'; +my $tmpfile_link = $tmpfile.'2'; - my $funky_FAT_timestamps = $Is_Cygwin; - sleep 3 if $funky_FAT_timestamps; +unlink $tmpfile; +open(FOO, ">$tmpfile") || BAILOUT("Can't open temp test file: $!"); - print FOO "Now is the time for all good men to come to.\n"; - close(FOO); +# hack to make Apollo update link count: +$junk = `ls $tmpfile` unless ($Is_MSWin32 || $Is_NetWare || $Is_Dos); - sleep 2 unless $funky_FAT_timestamps; +my($nlink, $mtime, $ctime) = (stat(FOO))[$NLINK, $MTIME, $CTIME]; +is($nlink, 1, 'nlink on regular file'); -} else { - print "# open failed: $!\nnot ok 1\nnot ok 2\n"; +SKIP: { + skip "mtime and ctime not reliable", 2 + if $Is_MSWin32 or $Is_NetWare or $Is_Cygwin or $Is_Dos; + + ok( $mtime, 'mtime' ); + is( $mtime, $ctime, 'mtime == ctime' ); } -if ($Is_Dosish || $Is_MPE) { unlink "Op.stat.tmp2"} -else { - `rm -f Op.stat.tmp2;ln Op.stat.tmp Op.stat.tmp2; chmod 644 Op.stat.tmp`; + +# Cygwin seems to have a 3 second granularity on its timestamps. +my $funky_FAT_timestamps = $Is_Cygwin; +sleep 3 if $funky_FAT_timestamps; + +print FOO "Now is the time for all good men to come to.\n"; +close(FOO); + +sleep 2 unless $funky_FAT_timestamps; + + +SKIP: { + unlink $tmpfile_link; + + skip "No hard links", 5 if $Is_Dosish || $Is_MPE; + + ok( link($tmpfile, $tmpfile_link), 'linked tmp testfile' ); + ok( chmod(0644, $tmpfile), 'chmoded tmp testfile' ); + + my($nlink, $mtime, $ctime) = (stat($tmpfile))[$NLINK, $MTIME, $CTIME]; + + SKIP: { + skip "No link count", 1 if $Config{dont_use_nlink}; + is($nlink, 2, 'Link count on hard linked file' ); + } + + SKIP: { + skip "Solaris tmpfs has different mtime/ctime link semantics", 2 + if $Is_Solaris and $cwd =~ m#^/tmp# and + $mtime && $mtime == $ctime; + skip "AFS has different mtime/ctime link semantics", 2 + if $cwd =~ m#$Config{'afsroot'}/#; + skip "AmigaOS has different mtime/ctime link semantics", 2 + if $Is_Amiga; + + if( !ok($mtime, 'hard link mtime') || + !isnt($mtime, $ctime, 'hard link ctime != mtime') ) { + print <$tmpfile") || BAILOUT("Can't open temp test file: $!"); +close F; + +ok(-z $tmpfile, '-z on empty file'); +ok(! -s $tmpfile, ' and -s'); + +open(F, ">$tmpfile") || BAILOUT("Can't open temp test file: $!"); +print F "hi\n"; +close F; + +ok(! -z $tmpfile, '-z on non-empty file'); +ok(-s $tmpfile, ' and -s'); + + +# Strip all access rights from the file. +ok( chmod(0000, $tmpfile), 'chmod 0000' ); + +SKIP: { + # Going to try to switch away from root. Might not work. + my $olduid = $>; + eval { $> = 1; }; + skip "Can't test -r or -w meaningfully if you're superuser", 2 if $> == 0; + + SKIP: { + skip "Can't test -r meaningfully?", 1 if $Is_Dos || $Is_Cygwin; + ok(!-r $tmpfile, " -r"); + } + + ok(!-w $tmpfile, " -w"); + + # switch uid back (may not be implemented) + eval { $> = $olduid; }; } -elsif ( ($mtime && $mtime != $ctime) ) { - print "ok 4\n"; + +ok(! -x $tmpfile, ' -x'); + + +# in ms windows, $tmpfile inherits owner uid from directory +# not sure about os/2, but chown is harmless anyway +eval { chown $>,$tmpfile; 1 } or print "# $@" ; + +ok(chmod(0700,$tmpfile), 'chmod 0700'); +ok(-r $tmpfile, ' -r'); +ok(-w $tmpfile, ' -w'); + +SKIP: { + skip "-x simply determins if a file ends in an executable suffix", 1 + if $Is_Dosish; + + ok(-x $tmpfile, ' -x'); } -else { - print "not ok 4\n"; - print "#4 If test op/stat.t fails test 4, check if you are on a tmpfs\n"; - print "#4 of some sort. Building in /tmp sometimes has this problem.\n"; - print "#4 Also building on the ClearCase VOBS filesystem may cause this failure.\n"; + +ok( -f $tmpfile, ' -f'); +ok(! -d $tmpfile, ' !-d'); + +# Is this portable? +ok( -d '.', '-d cwd' ); +ok(! -f '.', '!-f cwd' ); + +SKIP: { + skip "Test uses unixisms", 1 if $Is_Dosish; + skip "perl not a symlink", 1 unless `ls -l perl` =~ /^l.*->/; + + ok(-l 'perl', '-l'); } -print "#4 :$mtime: should != :$ctime:\n"; - -unlink "Op.stat.tmp" or print "# unlink failed: $!\n"; -if ($Is_MSWin32 || $Is_NetWare) { open F, '>Op.stat.tmp' and close F } -else { `touch Op.stat.tmp` } - -if (-z 'Op.stat.tmp') {print "ok 5\n";} else {print "not ok 5\n";} -if (! -s 'Op.stat.tmp') {print "ok 6\n";} else {print "not ok 6\n";} - -`echo hi >Op.stat.tmp`; -if (! -z 'Op.stat.tmp') {print "ok 7\n";} else {print "not ok 7\n";} -if (-s 'Op.stat.tmp') {print "ok 8\n";} else {print "not ok 8\n";} - -unlink 'Op.stat.tmp' or print "# unlink failed: $!\n"; -$olduid = $>; # can't test -r if uid == 0 -`echo hi >Op.stat.tmp`; -chmod 0,'Op.stat.tmp'; -eval '$> = 1;'; # so switch uid (may not be implemented) -if (!$> || $Is_Dos || $Is_Cygwin || ! -r 'Op.stat.tmp') {print "ok 9\n";} else {print "not ok 9\n";} -if (!$> || ! -w 'Op.stat.tmp') {print "ok 10\n";} else {print "not ok 10\n";} -eval '$> = $olduid;'; # switch uid back (may not be implemented) -print "# olduid=$olduid, newuid=$>\n" unless ($> == $olduid); - -if (! -x 'Op.stat.tmp') {print "ok 11\n";} -else {print "not ok 11\n";} - -foreach ((12,13,14,15,16,17)) { - print "ok $_\n"; #deleted tests + +ok(-o $tmpfile, '-o'); + +ok(-e $tmpfile, '-e'); +ok(unlink($tmpfile_link), 'unlink'); +ok(! -e $tmpfile_link, ' -e on unlinked file'); + +SKIP: { + skip "No character special files", 1 + if $Is_MSWin32 || $Is_NetWare || $Is_Dos; + skip "No character special files to test against", 1 + if $Dev_list !~ /\nc.* (\S+)\n/; + + ok(-c "/dev/$1", '-c'); } +ok(! -c '.', '!-c cwd'); -# in ms windows, Op.stat.tmp inherits owner uid from directory -# not sure about os/2, but chown is harmless anyway -eval { chown $>,'Op.stat.tmp'; 1 } or print "# $@" ; -chmod 0700,'Op.stat.tmp'; -if (-r 'Op.stat.tmp') {print "ok 18\n";} else {print "not ok 18\n";} -if (-w 'Op.stat.tmp') {print "ok 19\n";} else {print "not ok 19\n";} -if ($Is_Dosish) {print "ok 20 # skipped: -x by extension\n";} -elsif (-x 'Op.stat.tmp') {print "ok 20\n";} -else {print "not ok 20\n";} - -if (-f 'Op.stat.tmp') {print "ok 21\n";} else {print "not ok 21\n";} -if (! -d 'Op.stat.tmp') {print "ok 22\n";} else {print "not ok 22\n";} - -if (-d '.') {print "ok 23\n";} else {print "not ok 23\n";} -if (! -f '.') {print "ok 24\n";} else {print "not ok 24\n";} - -if (!$Is_Dosish and `ls -l perl` =~ /^l.*->/) { - if (-l 'perl') {print "ok 25\n";} else {print "not ok 25\n";} +SKIP: { + skip "No socket files", 1 if $Is_MSWin32 || $Is_NetWare || $Is_Dos; + skip "No socket files to test against", 1 + if $Dev_list !~ /\ns.* (\S+)\n/; + + ok(-S "/dev/$1", '-S'); } -else { - print "ok 25\n"; +ok(! -S '.', '!-S cwd'); + +SKIP: { + skip "No block files", 1 if $Is_MSWin32 || $Is_NetWare || $Is_Dos; + skip "No block files to test against", 1 + if $Dev_list !~ /\nb.* (\S+)\n/; + + ok(-b "/dev/$1", '-b'); } -if (-o 'Op.stat.tmp') {print "ok 26\n";} else {print "not ok 26\n";} - -if (-e 'Op.stat.tmp') {print "ok 27\n";} else {print "not ok 27\n";} -unlink 'Op.stat.tmp2'; -if (! -e 'Op.stat.tmp2') {print "ok 28\n";} else {print "not ok 28\n";} - -if ($Is_MSWin32 || $Is_NetWare || $Is_Dos) - {print "ok 29\n";} -elsif ($DEV !~ /\nc.* (\S+)\n/) - {print "ok 29\n";} -elsif (-c "/dev/$1") - {print "ok 29\n";} -else - {print "not ok 29\n";} -if (! -c '.') {print "ok 30\n";} else {print "not ok 30\n";} - -if ($Is_MSWin32 || $Is_NetWare || $Is_Dos) - {print "ok 31\n";} -elsif ($DEV !~ /\ns.* (\S+)\n/) - {print "ok 31\n";} -elsif (-S "/dev/$1") - {print "ok 31\n";} -else - {print "not ok 31\n";} -if (! -S '.') {print "ok 32\n";} else {print "not ok 32\n";} - -if ($Is_MSWin32 || $Is_NetWare || $Is_Dos) - {print "ok 33\n";} -elsif ($DEV !~ /\nb.* (\S+)\n/) - {print "ok 33\n";} -elsif (-b "/dev/$1") - {print "ok 33\n";} -else - {print "not ok 33\n";} -if (! -b '.') {print "ok 34\n";} else {print "not ok 34\n";} - -if ($Is_MPE or $^O eq 'amigaos' or $Is_Dosish or $Is_Cygwin) { - print "ok 35 # skipped: no -u\n"; goto tty_test; -} +ok(! -b '.', '!-b cwd'); + +SKIP: { + skip "No setuid", 2 if $Is_MPE or $Is_Amiga or $Is_Dosish or $Is_Cygwin; -$cnt = $uid = 0; - -die "Can't run op/stat.t test 35 without pwd working" unless $cwd; -my @bin = grep {-d && -r && -x} ($^O eq 'machten' ? - qw(/usr/bin /bin) : - qw(/sbin /usr/sbin /bin /usr/bin)); -unless (@bin) { print ("not ok 35\n"), goto tty_test; } -for my $bin (@bin) { - opendir BIN, $bin or die "Can't opendir $bin: $!"; - while (defined($_ = readdir BIN)) { - $_ = "$bin/$_"; - $cnt++; - $uid++ if -u; - last if $uid && $uid < $cnt; + my($cnt, $uid); + $cnt = $uid = 0; + + # Find a set of directories that's very likely to have setuid files + # but not likely to be *all* setuid files. + my @bin = grep {-d && -r && -x} qw(/sbin /usr/sbin /bin /usr/bin); + skip "Can't find a setuid file to test with", 2 unless @bin; + + for my $bin (@bin) { + opendir BIN, $bin or die "Can't opendir $bin: $!"; + while (defined($_ = readdir BIN)) { + $_ = "$bin/$_"; + $cnt++; + $uid++ if -u; + last if $uid && $uid < $cnt; + } + } + closedir BIN; + + if( !isnt($uid, 0, 'found some setuid programs') || + !ok($uid < $cnt, " they're not all setuid") ) + { + print < 0 && $uid < $cnt) - {print "ok 35\n";} -else - {print "not ok 35 \n# ($uid $cnt)\n";} -tty_test: # To assist in automated testing when a controlling terminal (/dev/tty) # may not be available (at, cron rsh etc), the PERL_SKIP_TTY_TEST env var # can be set to skip the tests that need a tty. -unless($ENV{PERL_SKIP_TTY_TEST}) { - if ($Is_MSWin32 || $Is_NetWare) { - print "ok 36 # Skip: $^O\n"; - print "ok 37 # Skip: $^O\n"; - } - else { - my $TTY = $^O eq 'rhapsody' ? "/dev/ttyp0" : "/dev/tty"; - if (defined $TTY) { - unless (open(TTY, $TTY)) { - print STDERR "Can't open $TTY--run t/TEST outside of make.\n"; - } - if (-t TTY) {print "ok 36\n";} else {print "not ok 36\n";} - if (-c TTY) {print "ok 37\n";} else {print "not ok 37\n";} - close(TTY); - } else { # if some platform completely undefines $TTY - print "ok 36 # skipped\n"; - print "ok 37 # skipped\n"; - } +SKIP: { + skip "These tests require a TTY", 4 if $ENV{PERL_SKIP_TTY_TEST}; + + my $TTY = $^O eq 'rhapsody' ? "/dev/ttyp0" : "/dev/tty"; + + SKIP: { + skip "Test uses unixisms", 2 if $Is_MSWin32 || $Is_NetWare; + skip "No TTY to test -t with", 2 unless -e $TTY; + + open(TTY, $TTY) || + warn "Can't open $TTY--run t/TEST outside of make.\n"; + ok(-t TTY, '-t'); + ok(-c TTY, 'tty is -c'); + close(TTY); } - if (! -t TTY) {print "ok 38\n";} else {print "not ok 38\n";} - if (-t) {print "ok 39\n";} else {print "not ok 39\n";} + ok(! -t TTY, '!-t on closed TTY filehandle'); + ok(-t, '-t on STDIN'); } -else { - for (36..39) { print "ok $_ # Skip: PERL_SKIP_TTY_TEST\n" } + + +SKIP: { + skip "No /dev/null to test with", 1 unless -e '/dev/null'; + + open(NULL,"/dev/null") or BAIL_OUT("Can't open /dev/null equivalent: $!"); + ok(! -t NULL, '/dev/null is not a TTY'); + close(NULL); } -open(null,"/dev/null"); -if (! -t null || -e '/xenix' || $^O eq 'machten' || $Is_MSWin32 || $Is_NetWare) - {print "ok 40\n";} else {print "not ok 40\n";} -close(null); + # These aren't strictly "stat" calls, but so what? -if (-T 'op/stat.t') {print "ok 41\n";} else {print "not ok 41\n";} -if (! -B 'op/stat.t') {print "ok 42\n";} else {print "not ok 42\n";} +ok(-T 'op/stat.t', '-T'); +ok(! -B 'op/stat.t', '!-B'); -if (-B './perl' || -B './perl.exe') {print "ok 43\n";} else {print "not ok 43\n";} -if (! -T './perl' && ! -T './perl.exe') {print "ok 44\n";} else {print "not ok 44\n";} +ok(-B $^X, '-B'); +ok(! -T $^X, '!-T'); open(FOO,'op/stat.t'); -eval { -T FOO; }; -if ($@ =~ /not implemented/) { - print "# $@"; - for (45 .. 54) { - print "ok $_\n"; - } -} -else { - if (-T FOO) {print "ok 45\n";} else {print "not ok 45\n";} - if (! -B FOO) {print "ok 46\n";} else {print "not ok 46\n";} +SKIP: { + eval { -T FOO; }; + skip "-T/B on filehandle not implemented", 12 if $@ =~ /not implemented/; + + is( $@, '', '-T on filehandle causes no errors' ); + + ok(-T FOO, ' -T'); + ok(! -B FOO, ' !-B'); + $_ = ; - if (/perl/) {print "ok 47\n";} else {print "not ok 47\n";} - if (-T FOO) {print "ok 48\n";} else {print "not ok 48\n";} - if (! -B FOO) {print "ok 49\n";} else {print "not ok 49\n";} + ok(/perl/, 'after readline'); + ok(-T FOO, ' still -T'); + ok(! -B FOO, ' still -B'); close(FOO); open(FOO,'op/stat.t'); $_ = ; - if (/perl/) {print "ok 50\n";} else {print "not ok 50\n";} - if (-T FOO) {print "ok 51\n";} else {print "not ok 51\n";} - if (! -B FOO) {print "ok 52\n";} else {print "not ok 52\n";} - seek(FOO,0,0); - if (-T FOO) {print "ok 53\n";} else {print "not ok 53\n";} - if (! -B FOO) {print "ok 54\n";} else {print "not ok 54\n";} + ok(/perl/, 'reopened and after readline'); + ok(-T FOO, ' still -T'); + ok(! -B FOO, ' still !-B'); + + ok(seek(FOO,0,0), 'after seek'); + ok(-T FOO, ' still -T'); + ok(! -B FOO, ' still !-B'); } close(FOO); -if (-T '/dev/null') {print "ok 55\n";} else {print "not ok 55\n";} -if (-B '/dev/null') {print "ok 56\n";} else {print "not ok 56\n";} + +ok(-T '/dev/null', '/dev/null is -T'); +ok(-B '/dev/null', ' and -B'); + # and now, a few parsing tests: -$_ = 'Op.stat.tmp'; -if (-f) {print "ok 57\n";} else {print "not ok 57\n";} -if (-f()) {print "ok 58\n";} else {print "not ok 58\n";} +$_ = $tmpfile; +ok(-f, 'bare -f uses $_'); +ok(-f(), ' -f() "'); -unlink 'Op.stat.tmp' or print "# unlink failed: $!\n"; +unlink $tmpfile or print "# unlink failed: $!\n"; # bug id 20011101.069 my @r = \stat("."); -if (@r == 13) { print "ok 59\n" } else { print "not ok 59\n" } +is(scalar @r, 13, 'stat returns full 13 elements'); +