Author: jkeenan
Date: Sat Aug 9 10:40:32 2008
New Revision: 30145
Removed:
branches/stepdescription/t/configure/055-fatal_step.t
branches/stepdescription/t/configure/056-fatal_step.t
branches/stepdescription/t/configure/057-fatal_step.t
branches/stepdescription/t/configure/058-fatal_step.t
Modified:
branches/stepdescription/MANIFEST
branches/stepdescription/MANIFEST.SKIP
branches/stepdescription/lib/Parrot/Configure.pm
branches/stepdescription/t/configure/037-run_single_step.t
Log:
Eliminate --fatal-step=n option; allow only --fatal-step=step::class.
Modified: branches/stepdescription/MANIFEST
==============================================================================
--- branches/stepdescription/MANIFEST (original)
+++ branches/stepdescription/MANIFEST Sat Aug 9 10:40:32 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Aug 4 18:45:47 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Aug 9 17:26:00 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -2008,6 +2008,7 @@
languages/perl6/t/harness [perl6]
languages/perl6/t/pmc/mutable.t [perl6]
languages/perl6/t/pmc/mutablevar.t [perl6]
+languages/perl6/t/pmc/perl6multisub-basic.t [perl6]
languages/perl6/t/spectest_regression.data [perl6]
languages/perl6/tools/autounfudge.pl [perl6]
languages/perl6/tools/fudge_purity_inspector.pl [perl6]
@@ -2820,16 +2821,6 @@
lib/SmartLink.pm [devel]
parrot.spec []
parrotbug []
-ports/cygwin/README [cygwin]
-ports/cygwin/libparrot-devel.hint [cygwin]
-ports/cygwin/libparrot0.hint [cygwin]
-ports/cygwin/parrot-0.6.4-2.cygport [cygwin]
-ports/cygwin/parrot-0.6.4-2.src.patch [cygwin]
-ports/cygwin/parrot-languages.hint [cygwin]
-ports/cygwin/parrot-perl6.hint [cygwin]
-ports/cygwin/parrot.hint [cygwin]
-ports/cygwin/postinstall.sh [cygwin]
-ports/cygwin/preremove.sh [cygwin]
runtime/parrot/dynext/README [devel]doc
runtime/parrot/include/DWIM.pir [devel]doc
runtime/parrot/include/README [devel]doc
@@ -3333,10 +3324,6 @@
t/configure/052-fatal_step.t []
t/configure/053-fatal_step.t []
t/configure/054-fatal_step.t []
-t/configure/055-fatal_step.t []
-t/configure/056-fatal_step.t []
-t/configure/057-fatal_step.t []
-t/configure/058-fatal_step.t []
t/configure/059-silent.t []
t/configure/060-silent.t []
t/configure/061-revision_from_cache.t []
Modified: branches/stepdescription/MANIFEST.SKIP
==============================================================================
--- branches/stepdescription/MANIFEST.SKIP (original)
+++ branches/stepdescription/MANIFEST.SKIP Sat Aug 9 10:40:32 2008
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Aug 4 22:54:16 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Aug 9 17:26:00 2008 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -907,6 +907,8 @@
# generated from svn:ignore of 'languages/lua/t/'
^languages/lua/t/.*\.lua$
^languages/lua/t/.*\.lua/
+^languages/lua/t/.*\.luac$
+^languages/lua/t/.*\.luac/
^languages/lua/t/.*\.orig_out$
^languages/lua/t/.*\.orig_out/
^languages/lua/t/.*\.parrot_out$
Modified: branches/stepdescription/lib/Parrot/Configure.pm
==============================================================================
--- branches/stepdescription/lib/Parrot/Configure.pm (original)
+++ branches/stepdescription/lib/Parrot/Configure.pm Sat Aug 9 10:40:32 2008
@@ -282,31 +282,17 @@
sub _handle_fatal_step_option {
my $conf = shift;
- my ($fatal_step) = @_;
+ my $fatal_step = shift;
my %steps_to_die_for = ();
- my $named_step_pattern = qr/(?:init|inter|auto|gen)::[a-z]+/;
- my $unit_step_pattern = qr/\d+|$named_step_pattern/;
+ my $named_step_pattern = qr/(?:init|inter|auto|gen)::\w+/;
if ( $fatal_step =~ /^
- $unit_step_pattern
- (, $unit_step_pattern)*
+ $named_step_pattern
+ (, $named_step_pattern)*
$/x
) {
my @fatal_steps = split /,/, $fatal_step;
for my $s (@fatal_steps) {
- if ($s =~ /^\d+$/) {
- die "No configuration step corresponding to $fatal_step"
- unless defined $conf->{list_of_steps}->[$s - 1];
- my $step_name = $conf->{list_of_steps}->[$s - 1];
- if ($step_name =~ /$named_step_pattern/) {
- $steps_to_die_for{$step_name}++;
- }
- else {
- die "Configuration step corresponding to $s is invalid";
- }
- }
- else {
- $steps_to_die_for{$s}++;
- }
+ $steps_to_die_for{$s}++;
}
}
else {
Modified: branches/stepdescription/t/configure/037-run_single_step.t
==============================================================================
--- branches/stepdescription/t/configure/037-run_single_step.t (original)
+++ branches/stepdescription/t/configure/037-run_single_step.t Sat Aug 9
10:40:32 2008
@@ -35,7 +35,7 @@
ok( !$@, "run_single_step() completed without error" );
like(
$stdout,
- qr/Setting up Configure's default values.*done./s, #'
+ qr/$step.*done./s, #'
"Got message expected upon running $step"
);
}
