Commit 821cb4b314 for perl
commit 821cb4b31413497cf3bfe54a3b4884a03f454e13
Author: James E Keenan <jamesekeenan@yahoo.com>
Date: Sun Oct 4 13:47:02 2026 -0400
t/TEST: Change /dump_?tests/ to 'dump_manifested_tests'
Currently, the '-dumptests' switch in t/TEST only reports tests
listed in the MANIFEST. In preparation for the addition/restoration of
tests generated via 'make' to the list of tests run by t/TEST, we need
to name things more precisely.
t/harness: For consistency with t/TEST, rename '@tests' and similar to
'@manifested_tests,' i.e., tests listed in MANIFEST.
diff --git a/t/TEST b/t/TEST
index 43aed512e2..891e93d966 100755
--- a/t/TEST
+++ b/t/TEST
@@ -128,7 +128,7 @@ my $is_os2 = $OS eq "os2";
our $show_elapsed_time = $ENV{HARNESS_TIMER} || 0;
-my $dump_tests = 0;
+my $dump_manifested_tests = 0;
# Cheesy version of Getopt::Std. We can't replace it with that, because we
# can't rely on require working.
@@ -141,7 +141,7 @@ my $dump_tests = 0;
utf8 => \$::with_utf8,
utf16 => \$::with_utf16,
taintwarn => \$::taintwarn,
- dumptests => \$dump_tests,
+ dump_manifested_tests => \$dump_manifested_tests,
);
my @argv = ();
@@ -521,7 +521,7 @@ sub _tests_from_manifest {
return @results;
}
-sub dump_tests {
+sub dump_manifested_tests {
my ($ary) = @_;
for my $test (sort @$ary) {
# convert it to a path from the root of the repo
@@ -645,7 +645,7 @@ unless (@ARGV) {
} @ARGV;
};
-dump_tests(\@ARGV) if $dump_tests;
+dump_manifested_tests(\@ARGV) if $dump_manifested_tests;
filter_taint_tests(\@ARGV);
diff --git a/t/harness b/t/harness
index c038ad3c96..8596f8a06a 100644
--- a/t/harness
+++ b/t/harness
@@ -72,10 +72,10 @@ $Verbose++ while @ARGV && $ARGV[0] eq '-v' && shift;
my $htoolnm;
my $hgrind_ct;
-my $dump_tests = 0;
-if ($ARGV[0] && $ARGV[0] =~ /^-?-dumptests$/) {
+my $dump_manifested_tests = 0;
+if ($ARGV[0] && $ARGV[0] =~ /^-?-dump_manifested_tests$/) {
shift;
- $dump_tests = 1;
+ $dump_manifested_tests = 1;
}
if ($ARGV[0] && $ARGV[0] =~ /^-?-torture$/) {
@@ -87,7 +87,7 @@ if ($ARGV[0] && $ARGV[0] =~ /^-?-torture$/) {
# which live dual lives on CPAN.
$ENV{PERL_CORE} = 1;
-my (@tests, @re, @anti_re);
+my (@manifested_tests, @re, @anti_re);
# [.VMS]TEST.COM calls harness with empty arguments, so clean-up @ARGV
@ARGV = grep $_ && length( $_ ) => @ARGV;
@@ -126,13 +126,13 @@ $jobs ||= 1;
my %total_time;
sub _compute_tests_and_ordering($) {
- my @tests = $_[0]->@*;
+ my @manifested_tests = $_[0]->@*;
my %dir;
my %all_dirs;
my %map_file_to_dir;
- if (!$dump_tests) {
+ if (!$dump_manifested_tests) {
require App::Prove::State;
if (!$state) {
# silence unhelpful warnings from App::Prove::State about not having
@@ -150,12 +150,12 @@ sub _compute_tests_and_ordering($) {
}
}
# For some reason get_tests returns *all* the tests previously run,
- # (in the right order), not simply the selection in @tests
+ # (in the right order), not simply the selection in @manifested_tests
# (in the right order). Not sure if this is a bug or a feature.
- # Whatever, *we* are only interested in the ones that are in @tests
+ # Whatever, *we* are only interested in the ones that are in @manifested_tests
my %seen;
- @seen{@tests} = ();
- @tests = grep {exists $seen{$_} } $state->get_tests(0, @tests);
+ @seen{@manifested_tests} = ();
+ @manifested_tests = grep {exists $seen{$_} } $state->get_tests(0, @manifested_tests);
}
my %times;
@@ -168,7 +168,7 @@ sub _compute_tests_and_ordering($) {
my %partial_serials;
# Preprocess the list of tests
- for my $file (@tests) {
+ for my $file (@manifested_tests) {
if ($is_win32) {
$file =~ s,\\,/,g; # canonicalize path
};
@@ -198,7 +198,7 @@ sub _compute_tests_and_ordering($) {
my @alone_files;
# Ready to figure out the timings.
- for my $file (@tests) {
+ for my $file (@manifested_tests) {
my $file_dir = $map_file_to_dir{$file};
# if this is a file which must be processed alone
@@ -317,7 +317,7 @@ if (@ARGV) {
# Note: we use glob even on *nix and not just on Windows
# because arguments might be passed in via the TEST_ARGS
# env var where they wont be expanded by the shell.
- @tests = map(glob($_),@ARGV);
+ @manifested_tests = map(glob($_),@ARGV);
# This is a hack to force config_heavy.pl to be loaded, before the
# prep work for running a test changes directory.
1 if $Config{d_fork};
@@ -334,9 +334,9 @@ if (@ARGV) {
# but for now, run all directories in sequence.
- unless (@tests) {
+ unless (@manifested_tests) {
my @seq = <base/*.t>;
- push @tests, @seq;
+ push @manifested_tests, @seq;
my (@next, @last);
@@ -354,7 +354,7 @@ if (@ARGV) {
if (@next) {
@next = map { glob ("$_/*.t") } @next;
- push @tests, @next;
+ push @manifested_tests, @next;
push @seq, _compute_tests_and_ordering(\@next)->@*;
}
@@ -365,11 +365,11 @@ if (@ARGV) {
push @last, @ext_from_manifest;
push @seq, _compute_tests_and_ordering(\@last)->@*;
- push @tests, @last;
+ push @manifested_tests, @last;
$rules = { seq => \@seq };
- foreach my $test (@tests) {
+ foreach my $test (@manifested_tests) {
delete $non_ext->{$test};
}
@@ -382,11 +382,11 @@ if (@ARGV) {
}
}
if ($is_win32) {
- s,\\,/,g for @tests;
+ s,\\,/,g for @manifested_tests;
}
if (@re or @anti_re) {
my @keepers;
- foreach my $test (@tests) {
+ foreach my $test (@manifested_tests) {
my $keep = 0;
if (@re) {
foreach my $re (@re) {
@@ -404,20 +404,20 @@ if (@re or @anti_re) {
push @keepers, $test;
}
}
- @tests= @keepers;
+ @manifested_tests= @keepers;
}
# Allow e.g., ./perl t/harness t/op/lc.t
-for (@tests) {
+for (@manifested_tests) {
if (! -f $_ && !/^\.\./ && -f "../$_") {
$_ = "../$_";
s{^\.\./t/}{};
}
}
-dump_tests(\@tests) if $dump_tests;
+dump_manifested_tests(\@manifested_tests) if $dump_manifested_tests;
-filter_taint_tests(\@tests);
+filter_taint_tests(\@manifested_tests);
my %options;
@@ -500,7 +500,7 @@ $h->callback(
}
);
-my $agg = $h->runtests(@tests);
+my $agg = $h->runtests(@manifested_tests);
_cleanup_valgrind(\$htoolnm, \$hgrind_ct);
printf "Finished test run at %s.\n", scalar(localtime);
exit($agg->has_errors ? 1 : 0);
diff --git a/t/porting/test_testlist.t b/t/porting/test_testlist.t
index 106a1d9037..e2c5dcc702 100644
--- a/t/porting/test_testlist.t
+++ b/t/porting/test_testlist.t
@@ -21,13 +21,13 @@ $ENV{PERL_TORTURE_TEST} = 1;
$ENV{PERL_TEST_MEMORY} = 1;
$ENV{PERL_BENCHMARK} = 1;
-for my $file (`"$^X" t/harness -dumptests`) {
+for my $file (`"$^X" t/harness -dump_manifested_tests`) {
chomp $file;
$all{$file}++;
$th{$file}++;
}
-for my $file (`"$^X" t/TEST -dumptests`) {
+for my $file (`"$^X" t/TEST -dump_manifested_tests`) {
chomp $file;
$all{$file}++;
delete $th{$file} or $tt{$file}++;