diff options
author | Jarkko Hietaniemi <jhi@iki.fi> | 1999-01-13 16:50:17 +0000 |
---|---|---|
committer | Jarkko Hietaniemi <jhi@iki.fi> | 1999-01-13 16:50:17 +0000 |
commit | 61ae2fbf8676dafa05a9a9a710fde421f30a2071 (patch) | |
tree | 4f497a4eee07a49f48be8badf49ad54f068f11f8 /t | |
parent | b8f0c030659550e4d527ee8f11cd2f012f1bd1b0 (diff) | |
download | perl-61ae2fbf8676dafa05a9a9a710fde421f30a2071.tar.gz |
Atari MiNT port by Guido Flohr <gufl0000@stud.uni-sb.de>
(the diffs were based on 5.004_02). Tested by Guido
and Frank Naumann <fnaumann@prinz-atm.CS.Uni-Magdeburg.De>.
p4raw-id: //depot/cfgperl@2594
Diffstat (limited to 't')
-rwxr-xr-x | t/io/fs.t | 2 | ||||
-rwxr-xr-x | t/lib/safe2.t | 12 | ||||
-rwxr-xr-x | t/op/groups.t | 4 | ||||
-rwxr-xr-x | t/op/mkdir.t | 2 | ||||
-rwxr-xr-x | t/op/taint.t | 5 |
5 files changed, 14 insertions, 11 deletions
@@ -9,7 +9,7 @@ BEGIN { use Config; -$Is_Dosish = ($^O eq 'dos' or $^O eq 'os2'); +$Is_Dosish = ($^O eq 'dos' or $^O eq 'os2' or $^O eq 'mint'); # avoid win32 (for now) do { print "1..0\n"; exit(0); } if $^O eq 'MSWin32'; diff --git a/t/lib/safe2.t b/t/lib/safe2.t index c9e38808b3..6afc117729 100755 --- a/t/lib/safe2.t +++ b/t/lib/safe2.t @@ -8,8 +8,8 @@ BEGIN { print "1..0\n"; exit 0; } - # test 30 rather naughtily expects English error messages - $ENV{'LC_ALL'} = 'C'; + # test 30 rather naughtily expects English error messages + $ENV{'LC_ALL'} = 'C'; } # Tests Todo: @@ -122,11 +122,9 @@ print $@ =~ /foo bar/ ? "ok 29\n" : "not ok 29\n"; my $t = 30; $cpt->rdo('/non/existant/file.name'); -print +(($! =~ /No such file/ || $! =~ /file specification syntax error/) || - $! =~ /A file or directory in the path name does not exist/ || - $! =~ /Invalid argument/ || - $! =~ /Device not configured/ ? - "ok $t\n" : "not ok $t # $!\n"); $t++; +# The regexp is getting rather baroque. +print $! =~ /No such file|file specification syntax error|A file or directory in the path name does not exist|Invalid argument|Device not configured|file not found/i ? "ok $t\n" : "not ok $t # $!\n"; $t++; +# test #31 is gone. print 1 ? "ok $t\n" : "not ok $t\n#$@/$!\n"; $t++; #my $rdo_file = "tmp_rdo.tpl"; diff --git a/t/op/groups.t b/t/op/groups.t index 8d5689ec62..824e88d28e 100755 --- a/t/op/groups.t +++ b/t/op/groups.t @@ -1,6 +1,8 @@ #!./perl -$ENV{PATH} = '/bin:/usr/bin:/usr/xpg4/bin:/usr/ucb'; +$ENV{PATH} ="/bin:/usr/bin:/usr/xpg4/bin:/usr/ucb" . + exists $ENV{PATH} ? ":$ENV{PATH}" : ""; +$ENV{LC_ALL} = "C"; # so that external utilities speak English # We have to find a command that prints all (effective # and real) group names (not ids). The known commands are: diff --git a/t/op/mkdir.t b/t/op/mkdir.t index 5ba0a0f18d..acf16c14a4 100755 --- a/t/op/mkdir.t +++ b/t/op/mkdir.t @@ -15,4 +15,4 @@ print ($! =~ /exist|denied/ ? "ok 3\n" : "# $!\nnot ok 3\n"); print (-d 'blurfl' ? "ok 4\n" : "not ok 4\n"); print (rmdir('blurfl') ? "ok 5\n" : "not ok 5\n"); print (rmdir('blurfl') ? "not ok 6\n" : "ok 6\n"); -print ($! =~ /such|exist/ ? "ok 7\n" : "not ok 7\n"); +print ($! =~ /such|exist|not found/i ? "ok 7\n" : "not ok 7\n"); diff --git a/t/op/taint.t b/t/op/taint.t index d2cae8e70a..379093f587 100755 --- a/t/op/taint.t +++ b/t/op/taint.t @@ -366,7 +366,10 @@ else { test 72, $@ eq '', $@; # NB: This should be allowed # Try first new style but allow also old style. - test 73, $!{ENOENT} || $! == 2 || ($Is_Dos && $! == 22); # File not found + test 73, $!{ENOENT} || + $! == 2 || # File not found + ($Is_Dos && $! == 22) || + ($^O eq 'mint' && $! == 33); test 74, eval { open FOO, "> $foo" } eq '', 'open for write'; test 75, $@ =~ /^Insecure dependency/, $@; |