Author: jkeenan
Date: Sun Apr 15 08:57:33 2007
New Revision: 18222
Added:
branches/reconfigure/t/configure/testlib/
branches/reconfigure/t/configure/testlib/init/
branches/reconfigure/t/configure/testlib/init/foobar.pm (contents, props
changed)
Modified:
branches/reconfigure/t/configure/01-options.t
branches/reconfigure/t/configure/02-messages.t
branches/reconfigure/t/configure/03-steplist.t
branches/reconfigure/t/configure/04-configure.t
branches/reconfigure/t/configure/05-run_one_step.t
branches/reconfigure/t/configure/06-bad_step.t
branches/reconfigure/t/configure/07-verbose_two.t
branches/reconfigure/t/configure/08-verbose_step_number.t
branches/reconfigure/t/configure/09-verbose_step_regex.t
branches/reconfigure/t/configure/10-verbose_step_number_not_called.t
Log:
1. Added a module for use only in testing configuration tools:
t/configure/testlib/init/foobar.pm.
2. Modified t/configure/07 .. 10.t to use init::foobar rather than
init::manifest.
3. Added coda to all test files and newly created test module.
4. Delete some commented-out code.
Modified: branches/reconfigure/t/configure/01-options.t
==============================================================================
--- branches/reconfigure/t/configure/01-options.t (original)
+++ branches/reconfigure/t/configure/01-options.t Sun Apr 15 08:57:33 2007
@@ -262,3 +262,10 @@
Parrot::Configure::Options, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/02-messages.t
==============================================================================
--- branches/reconfigure/t/configure/02-messages.t (original)
+++ branches/reconfigure/t/configure/02-messages.t Sun Apr 15 08:57:33 2007
@@ -98,3 +98,10 @@
Parrot::Configure::Messages, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/03-steplist.t
==============================================================================
--- branches/reconfigure/t/configure/03-steplist.t (original)
+++ branches/reconfigure/t/configure/03-steplist.t Sun Apr 15 08:57:33 2007
@@ -61,3 +61,10 @@
Parrot::Configure::Step::List, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/04-configure.t
==============================================================================
--- branches/reconfigure/t/configure/04-configure.t (original)
+++ branches/reconfigure/t/configure/04-configure.t Sun Apr 15 08:57:33 2007
@@ -135,3 +135,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/05-run_one_step.t
==============================================================================
--- branches/reconfigure/t/configure/05-run_one_step.t (original)
+++ branches/reconfigure/t/configure/05-run_one_step.t Sun Apr 15 08:57:33 2007
@@ -26,9 +26,6 @@
use Parrot::BuildUtil;
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-#use_ok('Parrot::Configure::Step::List', qw|
-# get_steps_list
-#| );
use Parrot::IO::Capture::Mini;
my $parrot_version = Parrot::BuildUtil::parrot_version();
@@ -135,3 +132,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/06-bad_step.t
==============================================================================
--- branches/reconfigure/t/configure/06-bad_step.t (original)
+++ branches/reconfigure/t/configure/06-bad_step.t Sun Apr 15 08:57:33 2007
@@ -105,3 +105,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/07-verbose_two.t
==============================================================================
--- branches/reconfigure/t/configure/07-verbose_two.t (original)
+++ branches/reconfigure/t/configure/07-verbose_two.t Sun Apr 15 08:57:33 2007
@@ -21,12 +21,13 @@
}
use Test::More tests => 14;
use Carp;
-use Data::Dumper;
-$Data::Dumper::Indent=1;
+#use Data::Dumper;
+#$Data::Dumper::Indent=1;
use Parrot::BuildUtil;
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
use Parrot::IO::Capture::Mini;
+use lib ("t/configure/testlib");
my $parrot_version = Parrot::BuildUtil::parrot_version();
like($parrot_version, qr/\d+\.\d+\.\d+/,
@@ -47,9 +48,8 @@
my $conf = Parrot::Configure->new;
ok(defined $conf, "Parrot::Configure->new() returned okay");
-my $step = q{init::manifest};
-# Following assignment would change if config/init/manifest.pm changed.
-my $description = q{Checking MANIFEST};
+my $step = q{init::foobar};
+my $description = 'Determining if your computer does foobar';
$conf->add_steps( $step );
my @confsteps = @{$conf->steps};
@@ -119,3 +119,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/08-verbose_step_number.t
==============================================================================
--- branches/reconfigure/t/configure/08-verbose_step_number.t (original)
+++ branches/reconfigure/t/configure/08-verbose_step_number.t Sun Apr 15
08:57:33 2007
@@ -27,6 +27,7 @@
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
use Parrot::IO::Capture::Mini;
+use lib ("t/configure/testlib");
my $parrot_version = Parrot::BuildUtil::parrot_version();
like($parrot_version, qr/\d+\.\d+\.\d+/,
@@ -47,9 +48,8 @@
my $conf = Parrot::Configure->new;
ok(defined $conf, "Parrot::Configure->new() returned okay");
-my $step = q{init::manifest};
-# Following assignment would change if config/init/manifest.pm changed.
-my $description = q{Checking MANIFEST};
+my $step = q{init::foobar};
+my $description = 'Determining if your computer does foobar';
$conf->add_steps( $step );
my @confsteps = @{$conf->steps};
@@ -115,3 +115,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/09-verbose_step_regex.t
==============================================================================
--- branches/reconfigure/t/configure/09-verbose_step_regex.t (original)
+++ branches/reconfigure/t/configure/09-verbose_step_regex.t Sun Apr 15
08:57:33 2007
@@ -27,6 +27,7 @@
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
use Parrot::IO::Capture::Mini;
+use lib ("t/configure/testlib");
my $parrot_version = Parrot::BuildUtil::parrot_version();
like($parrot_version, qr/\d+\.\d+\.\d+/,
@@ -36,7 +37,7 @@
is($|, 1, "output autoflush is set");
my $args = process_options( {
- argv => [ q{--verbose-step=MANIFEST} ],
+ argv => [ q{--verbose-step=foobar} ],
script => $0,
parrot_version => $parrot_version,
svnid => '$Id$',
@@ -47,9 +48,8 @@
my $conf = Parrot::Configure->new;
ok(defined $conf, "Parrot::Configure->new() returned okay");
-my $step = q{init::manifest};
-# Following assignment would change if config/init/manifest.pm changed.
-my $description = q{Checking MANIFEST};
+my $step = q{init::foobar};
+my $description = 'Determining if your computer does foobar';
$conf->add_steps( $step );
my @confsteps = @{$conf->steps};
@@ -116,3 +116,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/reconfigure/t/configure/10-verbose_step_number_not_called.t
==============================================================================
--- branches/reconfigure/t/configure/10-verbose_step_number_not_called.t
(original)
+++ branches/reconfigure/t/configure/10-verbose_step_number_not_called.t
Sun Apr 15 08:57:33 2007
@@ -27,6 +27,7 @@
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
use Parrot::IO::Capture::Mini;
+use lib ("t/configure/testlib");
my $parrot_version = Parrot::BuildUtil::parrot_version();
like($parrot_version, qr/\d+\.\d+\.\d+/,
@@ -47,9 +48,8 @@
my $conf = Parrot::Configure->new;
ok(defined $conf, "Parrot::Configure->new() returned okay");
-my $step = q{init::manifest};
-# Following assignment would change if config/init/manifest.pm changed.
-my $description = q{Checking MANIFEST};
+my $step = q{init::foobar};
+my $description = 'Determining if your computer does foobar';
$conf->add_steps( $step );
my @confsteps = @{$conf->steps};
@@ -116,3 +116,10 @@
Parrot::Configure, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Added: branches/reconfigure/t/configure/testlib/init/foobar.pm
==============================================================================
--- (empty file)
+++ branches/reconfigure/t/configure/testlib/init/foobar.pm Sun Apr 15
08:57:33 2007
@@ -0,0 +1,35 @@
+# Copyright (C) 2001-2003, The Perl Foundation.
+# $Id$
+
+=head1 NAME
+
+t/configure/testlib/init/foobar.pm - Module used in configuration tests
+
+=cut
+
+package init::foobar;
+use strict;
+use warnings;
+use vars qw($description @args);
+
+use base qw(Parrot::Configure::Step::Base);
+
+use Parrot::Configure::Step;
+
+$description = 'Determining if your computer does foobar';
[EMAIL PROTECTED] = ();
+
+sub runstep {
+ my ( $self, $conf ) = @_;
+ print "\nYou've got foobar\n";
+ return $self;
+}
+
+1;
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
