Author: jkeenan Date: Sun Apr 8 07:25:01 2007 New Revision: 18040 Removed: trunk/t/tools/ops2pmutils/testlib/ Modified: trunk/MANIFEST trunk/t/tools/ops2cutils/01-new.t trunk/t/tools/ops2pmutils/02-usage.t trunk/t/tools/ops2pmutils/04-prepare_ops.t trunk/t/tools/ops2pmutils/05-renum_op_map_file.t trunk/t/tools/ops2pmutils/06-load_op_map_files.t trunk/t/tools/ops2pmutils/07-no_ops_skip.t trunk/t/tools/ops2pmutils/08-sort_ops.t trunk/t/tools/ops2pmutils/09-prepare_real_ops.t trunk/t/tools/ops2pmutils/10-print_module.t trunk/t/tools/ops2pmutils/11-print_h.t
Log: 1. Responding to http://rt.perl.org/rt3//Ticket/Display.html?id=42332, am eliminating calls to t/tools/ops2pmutils/testlib/Capture.pm in t/tools/ops2pmutils/*.t and replacing them with calls to Parrot::IO::Capture::Mini. Hence, we can delete testlib/Capture.pm from MANIFEST and then eliminate the t/tools/ops2pmutils/testlib/ directory. 2. Eliminate 'use Data::Dumper;' where no longer needed. 3. Other small code cleanups. Modified: trunk/MANIFEST ============================================================================== --- trunk/MANIFEST (original) +++ trunk/MANIFEST Sun Apr 8 07:25:01 2007 @@ -3020,7 +3020,6 @@ t/tools/ops2pmutils/09-prepare_real_ops.t [] t/tools/ops2pmutils/10-print_module.t [] t/tools/ops2pmutils/11-print_h.t [] -t/tools/ops2pmutils/testlib/Capture.pm [] t/tools/pbc_merge.t [] t/tools/pmc2c.t [] t/tools/pmc2cutils/00-qualify.t [] Modified: trunk/t/tools/ops2cutils/01-new.t ============================================================================== --- trunk/t/tools/ops2cutils/01-new.t (original) +++ trunk/t/tools/ops2cutils/01-new.t Sun Apr 8 07:25:01 2007 @@ -25,8 +25,8 @@ use File::Copy; use File::Temp (qw| tempdir |); use_ok('Parrot::Ops2pm::Utils'); -use lib ("$main::topdir/t/tools/ops2cutils/testlib"); use_ok("Parrot::IO::Capture::Mini"); +use lib ("$main::topdir/t/tools/ops2cutils/testlib"); use_ok( "GenerateCore", qw| generate_core | ); my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops Modified: trunk/t/tools/ops2pmutils/02-usage.t ============================================================================== --- trunk/t/tools/ops2pmutils/02-usage.t (original) +++ trunk/t/tools/ops2pmutils/02-usage.t Sun Apr 8 07:25:01 2007 @@ -22,16 +22,14 @@ use Test::More tests => 14; use Carp; use Cwd; -use lib ("$main::topdir/t/tools/ops2pmutils/testlib"); -use_ok("Capture"); - +use_ok("Parrot::IO::Capture::Mini"); use_ok( 'Parrot::Ops2pm::Auxiliary', qw| Usage getoptions | ); ok( chdir $main::topdir, "Positioned at top-level Parrot directory" ); my $cwd = cwd(); my ( $msg, $tie, @lines ); { - $tie = tie *STDERR, "Capture" or croak "Unable to tie"; + $tie = tie *STDERR, "Parrot::IO::Capture::Mini" or croak "Unable to tie"; Usage(); $msg = $tie->READLINE; untie *STDERR or croak "Unable to untie"; Modified: trunk/t/tools/ops2pmutils/04-prepare_ops.t ============================================================================== --- trunk/t/tools/ops2pmutils/04-prepare_ops.t (original) +++ trunk/t/tools/ops2pmutils/04-prepare_ops.t Sun Apr 8 07:25:01 2007 @@ -20,14 +20,13 @@ unshift @INC, qq{$topdir/lib}; } use Test::More tests => 72; -use Data::Dumper; +use Carp; use File::Copy; use File::Temp (qw| tempdir |); use IO::File; -use lib ("$main::topdir/t/tools/ops2pmutils/testlib"); -use_ok("Capture"); use_ok('Parrot::Ops2pm::Utils'); +use_ok("Parrot::IO::Capture::Mini"); ok( chdir $main::topdir, "Positioned at top-level Parrot directory" ); @@ -112,7 +111,7 @@ isa_ok( $self, q{Parrot::Ops2pm::Utils} ); my $msg; - my $tie = tie *STDERR, "Capture"; + my $tie = tie *STDERR, "Parrot::IO::Capture::Mini" or croak "Unable to tie"; ok( defined $tie, "tie established for testing" ); ok( $self->prepare_ops, "prepare_ops() returned successfully" ); $msg = $tie->READLINE; Modified: trunk/t/tools/ops2pmutils/05-renum_op_map_file.t ============================================================================== --- trunk/t/tools/ops2pmutils/05-renum_op_map_file.t (original) +++ trunk/t/tools/ops2pmutils/05-renum_op_map_file.t Sun Apr 8 07:25:01 2007 @@ -21,7 +21,6 @@ } use Test::More tests => 27; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |); Modified: trunk/t/tools/ops2pmutils/06-load_op_map_files.t ============================================================================== --- trunk/t/tools/ops2pmutils/06-load_op_map_files.t (original) +++ trunk/t/tools/ops2pmutils/06-load_op_map_files.t Sun Apr 8 07:25:01 2007 @@ -21,7 +21,6 @@ } use Test::More tests => 76; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |); use IO::File; Modified: trunk/t/tools/ops2pmutils/07-no_ops_skip.t ============================================================================== --- trunk/t/tools/ops2pmutils/07-no_ops_skip.t (original) +++ trunk/t/tools/ops2pmutils/07-no_ops_skip.t Sun Apr 8 07:25:01 2007 @@ -21,7 +21,6 @@ } use Test::More tests => 14; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |); Modified: trunk/t/tools/ops2pmutils/08-sort_ops.t ============================================================================== --- trunk/t/tools/ops2pmutils/08-sort_ops.t (original) +++ trunk/t/tools/ops2pmutils/08-sort_ops.t Sun Apr 8 07:25:01 2007 @@ -20,14 +20,13 @@ unshift @INC, qq{$topdir/lib}; } use Test::More tests => 91; +use Carp; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |); -use lib ("$main::topdir/t/tools/ops2pmutils/testlib"); -use_ok("Capture"); use_ok('Parrot::Ops2pm::Utils'); +use_ok("Parrot::IO::Capture::Mini"); use constant NUM_FILE => "src/ops/ops.num"; use constant SKIP_FILE => "src/ops/ops.skip"; @@ -168,7 +167,8 @@ ok( -f $skip, "ops.skip located after renumbering" ); my $msg; - my $tie = tie *STDERR, "Capture"; + my $tie = tie *STDERR, "Parrot::IO::Capture::Mini" + or croak "Unable to tie"; ok( defined $tie, "tie established for testing" ); ok( $self->sort_ops(), "sort_ops returned successfully" ); $msg = $tie->READLINE; @@ -226,7 +226,8 @@ ok( -f $skip, "ops.skip located after renumbering" ); my $msg; - my $tie = tie *STDERR, "Capture"; + my $tie = tie *STDERR, "Parrot::IO::Capture::Mini" + or croak "Unable to tie"; ok( defined $tie, "tie established for testing" ); ok( $self->sort_ops(), "sort_ops returned successfully" ); $msg = $tie->READLINE; @@ -286,7 +287,8 @@ ok( -f $skip, "ops.skip located after renumbering" ); my $msg; - my $tie = tie *STDERR, "Capture"; + my $tie = tie *STDERR, "Parrot::IO::Capture::Mini" + or croak "Unable to tie"; ok( defined $tie, "tie established for testing" ); ok( $self->sort_ops(), "sort_ops returned successfully" ); $msg = $tie->READLINE; Modified: trunk/t/tools/ops2pmutils/09-prepare_real_ops.t ============================================================================== --- trunk/t/tools/ops2pmutils/09-prepare_real_ops.t (original) +++ trunk/t/tools/ops2pmutils/09-prepare_real_ops.t Sun Apr 8 07:25:01 2007 @@ -21,7 +21,6 @@ } use Test::More tests => 38; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |); use IO::File; Modified: trunk/t/tools/ops2pmutils/10-print_module.t ============================================================================== --- trunk/t/tools/ops2pmutils/10-print_module.t (original) +++ trunk/t/tools/ops2pmutils/10-print_module.t Sun Apr 8 07:25:01 2007 @@ -21,7 +21,6 @@ } use Test::More tests => 42; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |); use IO::File; Modified: trunk/t/tools/ops2pmutils/11-print_h.t ============================================================================== --- trunk/t/tools/ops2pmutils/11-print_h.t (original) +++ trunk/t/tools/ops2pmutils/11-print_h.t Sun Apr 8 07:25:01 2007 @@ -21,7 +21,6 @@ } use Test::More tests => 23; use Cwd; -use Data::Dumper; use File::Copy; use File::Temp (qw| tempdir |);
