diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-05-31 08:39:37 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-05-31 08:39:37 +0000 |
| commit | b705a5ea9fdd4854d4e38bf90cb9e2fada3dde80 (patch) | |
| tree | c746c0542cf00ab8aacb142fea5791a76ef2780e /t | |
| parent | e2a00deffd1120f4d05f9572ed3a9b28ad643f99 (diff) | |
| parent | a6812a524b77d57b0408b3660133be60f7f0f56d (diff) | |
| download | perl-b705a5ea9fdd4854d4e38bf90cb9e2fada3dde80.tar.gz | |
Integrate mainline
p4raw-id: //depot/perlio@16919
Diffstat (limited to 't')
| -rwxr-xr-x | t/TEST | 2 | ||||
| -rw-r--r-- | t/harness | 2 | ||||
| -rw-r--r-- | t/lib/sample-tests/die | 1 | ||||
| -rw-r--r-- | t/lib/sample-tests/skip_nomsg | 4 | ||||
| -rw-r--r-- | t/lib/sample-tests/skipall | 3 | ||||
| -rw-r--r-- | t/lib/sample-tests/skipall_nomsg | 2 | ||||
| -rw-r--r-- | t/test.pl | 3 |
7 files changed, 14 insertions, 3 deletions
@@ -97,7 +97,7 @@ unless (@ARGV) { my $mani = File::Spec->catfile($updir, "MANIFEST"); if (open(MANI, $mani)) { while (<MANI>) { # similar code in t/harness - if (m!^(ext/\S+/?([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) { + if (m!^(ext/\S+/?(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) { $t = $1; if (!$core || $t =~ m!^lib/[a-z]!) { @@ -71,7 +71,7 @@ if (@ARGV) { my $mani = File::Spec->catfile(File::Spec->updir, "MANIFEST"); if (open(MANI, $mani)) { while (<MANI>) { # similar code in t/TEST - if (m!^(ext/\S+/?([^/]+\.t|test\.pl)|lib/\S+?(\.t|test\.pl))\s!) { + if (m!^(ext/\S+/?(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) { push @tests, File::Spec->catfile($updir, $1); } } diff --git a/t/lib/sample-tests/die b/t/lib/sample-tests/die index ffd8e88109..4c8534082d 100644 --- a/t/lib/sample-tests/die +++ b/t/lib/sample-tests/die @@ -1,3 +1,2 @@ -use lib 'lib'; use if ($^O eq 'VMS'), vmsish => 'hushed'; exit 1; # exit because die() can be noisy diff --git a/t/lib/sample-tests/skip_nomsg b/t/lib/sample-tests/skip_nomsg new file mode 100644 index 0000000000..51d1ed6b43 --- /dev/null +++ b/t/lib/sample-tests/skip_nomsg @@ -0,0 +1,4 @@ +print <<DUMMY; +1..1 +ok 1 # Skip +DUMMY diff --git a/t/lib/sample-tests/skipall b/t/lib/sample-tests/skipall new file mode 100644 index 0000000000..8c4679660c --- /dev/null +++ b/t/lib/sample-tests/skipall @@ -0,0 +1,3 @@ +print <<DUMMY_TEST; +1..0 # skip: rope +DUMMY_TEST diff --git a/t/lib/sample-tests/skipall_nomsg b/t/lib/sample-tests/skipall_nomsg new file mode 100644 index 0000000000..9b0dc11a69 --- /dev/null +++ b/t/lib/sample-tests/skipall_nomsg @@ -0,0 +1,2 @@ +print "1..0\n"; +exit 0; @@ -433,6 +433,9 @@ sub which_perl { unless (defined $Perl) { $Perl = $^X; + # VMS should have 'perl' aliased properly + return $Perl if $^O eq 'VMS'; + my $exe; eval "require Config; Config->import"; if ($@) { |