From cffc7d4fc1c36169654f8447b23b3c5c43830eed Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 7 Apr 2020 21:55:53 +0000 Subject: tests: document run_mode=1 as not implemented It was implemented at some point, but it was more things to support and the worst of both worlds: both unrealistic compared to real-world use and slower than run_mode=2. Noticed while looking for speling erorrs. --- lib/PublicInbox/TestCommon.pm | 6 +++--- t/nntpd.t | 2 +- t/run.perl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 386610ff..6e3e9d8c 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -119,11 +119,11 @@ sub _undo_redirects ($) { } } -# $opt->{run_mode} (or $ENV{TEST_RUN_MODE}) allows chosing between +# $opt->{run_mode} (or $ENV{TEST_RUN_MODE}) allows choosing between # three ways to spawn our own short-lived Perl scripts for testing: # # 0 - (fork|vfork) + execve, the most realistic but slowest -# 1 - preloading and running in a forked subprocess (fast) +# 1 - (not currently implemented) # 2 - preloading and running in current process (slightly faster than 1) # # 2 is not compatible with scripts which use "exit" (which we'll try to @@ -247,7 +247,7 @@ sub wait_for_tail () { sleep(2) } sub start_script { my ($cmd, $env, $opt) = @_; my ($key, @argv) = @$cmd; - my $run_mode = $ENV{TEST_RUN_MODE} // $opt->{run_mode} // 1; + my $run_mode = $ENV{TEST_RUN_MODE} // $opt->{run_mode} // 2; my $sub = $run_mode == 0 ? undef : key2sub($key); my $tail_pid; if (my $tail_cmd = $ENV{TAIL}) { diff --git a/t/nntpd.t b/t/nntpd.t index 89085049..43b14d66 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -301,7 +301,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 is($? >> 8, 0, 'no errors'); } SKIP: { - if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//1)) { + if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//2)) { skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1; } my @of = `lsof -p $td->{pid} 2>/dev/null`; diff --git a/t/run.perl b/t/run.perl index 3e6801f2..017ca3e8 100755 --- a/t/run.perl +++ b/t/run.perl @@ -26,7 +26,7 @@ GetOptions('j|jobs=i' => \$jobs, 'log=s' => \$log_suffix, 's|shuffle' => \$shuffle, ) or die "Usage: $0 [-j JOBS] [--log=SUFFIX] [--repeat RUNS]"; -if (($ENV{TEST_RUN_MODE} // 1) == 0) { +if (($ENV{TEST_RUN_MODE} // 2) == 0) { die "$0 is not compatible with TEST_RUN_MODE=0\n"; } my @tests = scalar(@ARGV) ? @ARGV : glob('t/*.t'); -- cgit v1.2.3-24-ge0c7