summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-03-05 15:13:17 +0000
committerNicholas Clark <nick@ccl4.org>2011-03-05 20:26:11 +0000
commit6f4e0180354b12bf56e98f5c99c3f98bc4ec8b37 (patch)
treedea60519b4f62dc37be6eb231066d3c6ed663982
parentef23706341528838912bf72c2f11c8cd2d03ddcc (diff)
downloadperl-6f4e0180354b12bf56e98f5c99c3f98bc4ec8b37.tar.gz
Eliminate t/re/ReTest.pl. require './test.pl' directly in its 3 (former) users.
-rw-r--r--MANIFEST1
-rw-r--r--t/re/ReTest.pl15
-rw-r--r--t/re/pat.t2
-rw-r--r--t/re/pat_advanced.t2
-rw-r--r--t/re/pat_rt_report.t2
5 files changed, 3 insertions, 19 deletions
diff --git a/MANIFEST b/MANIFEST
index ca45bc3a7c..5e114a186c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -5051,7 +5051,6 @@ t/re/reg_pmod.t See if regexp /p modifier works as expected
t/re/reg_posixcc.t See if posix character classes behave consistently
t/re/reg_unsafe.t Check for unsafe match vars
t/re/re.t See if exportable 're' funcs in universal.c work
-t/re/ReTest.pl Test utilities for the t/re/pat*.t tests (used by do)
t/re/re_tests Regular expressions for regexp.t
t/re/rxcode.t See if /(?{ code })/ works
t/re/subst_amp.t See if $&-related substitution works
diff --git a/t/re/ReTest.pl b/t/re/ReTest.pl
deleted file mode 100644
index 5f1e6f3c79..0000000000
--- a/t/re/ReTest.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-#!./perl
-#
-# This is the test subs used for regex testing.
-# This used to be part of re/pat.t
-use warnings;
-use strict;
-use 5.010;
-use base qw/Exporter/;
-use Carp;
-
-$| = 1;
-
-require './test.pl';
-
-1;
diff --git a/t/re/pat.t b/t/re/pat.t
index 716e4fa937..e453327b04 100644
--- a/t/re/pat.t
+++ b/t/re/pat.t
@@ -18,7 +18,7 @@ $| = 1;
BEGIN {
chdir 't' if -d 't';
@INC = ('../lib','.');
- do "re/ReTest.pl" or die $@;
+ require './test.pl';
}
plan tests => 455; # Update this when adding/deleting tests.
diff --git a/t/re/pat_advanced.t b/t/re/pat_advanced.t
index 0cd93a2cef..4e8a0af73f 100644
--- a/t/re/pat_advanced.t
+++ b/t/re/pat_advanced.t
@@ -21,7 +21,7 @@ BEGIN {
}
chdir 't' if -d 't';
@INC = ('../lib','.');
- do "re/ReTest.pl" or die $@;
+ require './test.pl';
}
run_tests() unless caller;
diff --git a/t/re/pat_rt_report.t b/t/re/pat_rt_report.t
index 18005e6a87..5354b993d4 100644
--- a/t/re/pat_rt_report.t
+++ b/t/re/pat_rt_report.t
@@ -21,7 +21,7 @@ BEGIN {
}
chdir 't' if -d 't';
@INC = ('../lib','.');
- do "re/ReTest.pl" or die $@;
+ require './test.pl';
}