Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refactor 'make stresstest' to draw from t/spectest.data, and eliminat…

…e t/stresstest.data . Add some documentation to t/spectest.data about the meanings of the various tags.
  • Loading branch information...
commit 0ba07fac9c1949f6dd28a9054dd8d3cb935bf5b6 1 parent f0cf54e
@pmichaud pmichaud authored
View
6 build/Makefile.in
@@ -404,7 +404,7 @@ Test.pir: Test.pm perl6.pbc
test : coretest
-fulltest: coretest spectest stresstest
+fulltest: coretest stresstest
coretest: Test.pir $(PERL6_EXE)
PARROT=$(PARROT) $(PERL) t/harness t/00-parrot t/01-sanity t/02-embed
@@ -420,8 +420,8 @@ spectest_full: testable
quicktest: testable t/spectest.data
$(HARNESS_WITH_FUDGE_JOBS) --tests-from-file=t/spectest.data --long=0
-stresstest: testable t/stresstest.data
- $(HARNESS_WITH_FUDGE_JOBS) --tests-from-file=t/stresstest.data
+stresstest: testable t/spectest.data
+ $(HARNESS_WITH_FUDGE_JOBS) --tests-from-file=t/spectest.data --stress=1
spectest_checkout : t/spec
t/spec :
View
8 t/harness
@@ -22,6 +22,7 @@ GetOptions(
'jobs:1' => \my $jobs,
'icu:1' => \my $do_icu,
'long:1' => \my $do_long,
+ 'stress:0' => \my $do_stress,
'archive=s' => \my $archive,
'parrot_revision=s' => \my $parrot_revision,
);
@@ -38,8 +39,11 @@ if ($list_file) {
s/^\s+//;
s/\s+\z//;
my ($fn, $fudgespec) = split /\s+#\s*/;
- next if ($fudgespec && ($fudgespec =~ m/icu/) && !$do_icu);
- next if ($fudgespec && ($fudgespec =~ m/long/) && !$do_long);
+ if ($fudgespec) {
+ next if ($fudgespec =~ m/icu/) && !$do_icu;
+ next if ($fudgespec =~ m/long/) && !$do_long;
+ next if ($fudgespec =~ m/stress/) && !$do_stress;
+ }
$fn = "t/spec/$fn" unless $fn =~ m/^t\Q$slash\Espec\Q$slash\E/;
$fn =~ s{/}{$slash}g;
if ( -r $fn ) {
View
9 t/spectest.data
@@ -16,8 +16,12 @@
# S16-filehandles/unlink.t - regressed when spec changed (RT #68160)
# S07-iterators/range-iterator.t - regressed because conforms to obsolete version of spec
#
-# moved to stresstest:
-# integration/advent2009-day17.t
+# Each file may have one or more markers that deselects the test:
+# icu - run tests only if --icu=1 (default is 1)
+# long - run tests only if --long=1 (default is 1)
+# stress - run tests only if --stress=1 (default is 0)
+# See the "make quicktest" and "make stresstest" targets in
+# build/Makefile.in for examples of use.
integration/99problems-01-to-10.t
integration/99problems-11-to-20.t
@@ -41,6 +45,7 @@ integration/advent2009-day13.t
integration/advent2009-day14.t
integration/advent2009-day15.t
integration/advent2009-day16.t
+integration/advent2009-day17.t # stress
integration/advent2009-day18.t
integration/advent2009-day19.t
integration/advent2009-day20.t
View
1  t/stresstest.data
@@ -1 +0,0 @@
-integration/advent2009-day17.t
Please sign in to comment.
Something went wrong with that request. Please try again.