summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>2002-05-17 06:56:40 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>2002-05-17 06:56:40 +0000
commitd6240823f336ddd3e33fedd974418b05bff3ad24 (patch)
tree5e0540f60883dbc81ec4643883864d31c151e30f /t
parent0cff2cf3dc85787c2786f644ac6406c6b5148dad (diff)
parent9972c7afa298c7672cee8abcd659c49c40cda99b (diff)
downloadperl-d6240823f336ddd3e33fedd974418b05bff3ad24.tar.gz
Integrate mainline
p4raw-id: //depot/perlio@16645
Diffstat (limited to 't')
-rw-r--r--t/lib/st-dump.pl5
-rw-r--r--t/op/alarm.t2
2 files changed, 6 insertions, 1 deletions
diff --git a/t/lib/st-dump.pl b/t/lib/st-dump.pl
index 05028f30d8..6ce77f01ac 100644
--- a/t/lib/st-dump.pl
+++ b/t/lib/st-dump.pl
@@ -10,6 +10,11 @@
;# Baseline for first official release.
;#
+# NOTE THAT THIS FILE IS COPIED FROM ext/Storable/t/st-dump.pl
+# TO t/lib/st-dump.pl. One could also play games with
+# File::Spec->updir and catdir to get the st-dump.pl in
+# ext/Storable into @INC.
+
sub ok {
my ($num, $ok, $name) = @_;
$num .= " - $name" if defined $name and length $name;
diff --git a/t/op/alarm.t b/t/op/alarm.t
index 384ee1d028..8fb92964a3 100644
--- a/t/op/alarm.t
+++ b/t/op/alarm.t
@@ -46,6 +46,6 @@ is( $@, "ALARM!\n", 'alarm w/$SIG{ALRM} vs system()' );
{
local $TODO = "Why does system() block alarm() on $^O?"
- if $^O eq 'VMS' || $^O eq'MacOS';
+ if $^O eq 'VMS' || $^O eq'MacOS' || $^O eq 'dos';
ok( abs($diff - 3) <= 1, " right time (waited $diff secs for 3-sec alarm)" );
}