Author: jkeenan Date: Fri Apr 27 14:53:50 2007 New Revision: 18348 Modified: branches/reconfigure/MANIFEST branches/reconfigure/lib/Parrot/Configure/Data.pm branches/reconfigure/lib/Parrot/Configure/Step.pm branches/reconfigure/t/configure/04-configure.t branches/reconfigure/t/harness branches/reconfigure/t/postconfigure/01-data_slurp.t
Log: Bringing reconfigure branch into line with patches submitted in http://rt.perl.org/rt3/Ticket/Display.html?id=42777. Modified: branches/reconfigure/MANIFEST ============================================================================== --- branches/reconfigure/MANIFEST (original) +++ branches/reconfigure/MANIFEST Fri Apr 27 14:53:50 2007 @@ -2790,11 +2790,31 @@ t/configure/01-options.t [] t/configure/02-messages.t [] t/configure/03-steplist.t [] +t/configure/04-configure.t [] +t/configure/05-run_one_step.t [] +t/configure/06-bad_step.t [] +t/configure/07-verbose_two.t [] +t/configure/08-verbose_step_number.t [] +t/configure/09-verbose_step_regex.t [] +t/configure/10-verbose_step_number_not_called.t [] +t/configure/11-no_description.t [] +t/configure/12-verbose.t [] +t/configure/13-die.t [] +t/configure/14-params.t [] +t/configure/15-no_return.t [] +t/configure/16-no_return_but_result.t [] t/configure/base.t [] t/configure/config_steps.t [] -t/configure/configure.t [] t/configure/data.t [] t/configure/step.t [] +t/configure/testlib/init/alpha.pm [] +t/configure/testlib/init/beta.pm [] +t/configure/testlib/init/delta.pm [] +t/configure/testlib/init/epsilon.pm [] +t/configure/testlib/init/foobar.pm [] +t/configure/testlib/init/gamma.pm [] +t/configure/testlib/init/zeta.pm [] +t/postconfigure/01-data_slurp.t [] t/distro/file_metadata.t [] t/distro/manifest.t [] t/distro/manifest_skip.t [] Modified: branches/reconfigure/lib/Parrot/Configure/Data.pm ============================================================================== --- branches/reconfigure/lib/Parrot/Configure/Data.pm (original) +++ branches/reconfigure/lib/Parrot/Configure/Data.pm Fri Apr 27 14:53:50 2007 @@ -177,7 +177,7 @@ sub slurp() { my $self = shift; - my $res = eval "no strict; use Parrot::Config; \\%PConfig"; + my $res = eval "no strict; use Parrot::Config::Generated; \\%PConfig"; if ( not defined $res ) { die "You cannot use --step until you have completed the full configure process\n"; Modified: branches/reconfigure/lib/Parrot/Configure/Step.pm ============================================================================== --- branches/reconfigure/lib/Parrot/Configure/Step.pm (original) +++ branches/reconfigure/lib/Parrot/Configure/Step.pm Fri Apr 27 14:53:50 2007 @@ -36,9 +36,6 @@ use lib ("lib"); use Parrot::Configure; -## XXX $conf is a temporary hack -#our $conf; - my $conf = Parrot::Configure->new(); our @EXPORT = (); Modified: branches/reconfigure/t/configure/04-configure.t ============================================================================== --- branches/reconfigure/t/configure/04-configure.t (original) +++ branches/reconfigure/t/configure/04-configure.t Fri Apr 27 14:53:50 2007 @@ -85,7 +85,7 @@ is($conf->options->{c}->{debugging}, 1, "command-line option '--debugging' has been stored in object"); -my $res = eval "no strict; use Parrot::Config; \\%PConfig"; +my $res = eval "no strict; use Parrot::Config::Generated; \\%PConfig"; SKIP: { my $reason = <<REASON; If you have already completed configuration, Modified: branches/reconfigure/t/harness ============================================================================== --- branches/reconfigure/t/harness (original) +++ branches/reconfigure/t/harness Fri Apr 27 14:53:50 2007 @@ -153,7 +153,7 @@ # Pass in a list of tests to run on the command line, else run all the tests. my @default_tests = map {glob "t/$_/*.t"} qw( - configure compilers/imcc/* op pmc native_pbc dynpmc dynoplibs + configure postconfigure compilers/imcc/* op pmc native_pbc dynpmc dynoplibs compilers/past compilers/pge compilers/pge/p5regex compilers/pge/p6regex compilers/tge compilers/json library examples run src tools perl doc stm ); Modified: branches/reconfigure/t/postconfigure/01-data_slurp.t ============================================================================== --- branches/reconfigure/t/postconfigure/01-data_slurp.t (original) +++ branches/reconfigure/t/postconfigure/01-data_slurp.t Fri Apr 27 14:53:50 2007 @@ -133,7 +133,7 @@ Parrot::Config::Generated has been created. So certain tests need to be run when your Parrot filesystem is in a "pre-F<make>, post-F<Configure.pl> state. -The tests in this file test C<Parrot::Configure::Data::slurp(). What is +The tests in this file test C<Parrot::Configure::Data::slurp()>. What is 'slurped' here is an already created C<%Parrot::Config::PConfig>. =head1 AUTHOR
