Author: jkeenan
Date: Wed Feb 21 20:30:37 2007
New Revision: 17135

Modified:
   branches/buildtools/t/tools/ops2cutils/01-new.t
   branches/buildtools/t/tools/ops2cutils/02-usage.t
   branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t
   branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t
   branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t
   branches/buildtools/t/tools/ops2cutils/06-dynamic.t
   branches/buildtools/t/tools/ops2cutils/07-make_incdir.t
   branches/buildtools/t/tools/ops2cutils/08-nolines.t
   branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t

Log:
Added paragraph to POD for each test explaining that it is intended to be run
post-Configure.pl but pre-make.  Where appropriate, adapted test to use
Parrot::IO::Capture::Mini rather than testlib/Capture.pm.


Modified: branches/buildtools/t/tools/ops2cutils/01-new.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/01-new.t     (original)
+++ branches/buildtools/t/tools/ops2cutils/01-new.t     Wed Feb 21 20:30:37 2007
@@ -24,7 +24,7 @@
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
+use_ok( "Parrot::IO::Capture::Mini" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -52,7 +52,8 @@
 
     {
         local @ARGV = qw();
-        $tie = tie *STDERR, "Capture" or croak "Unable to tie";
+        $tie = tie *STDERR, "Parrot::IO::Capture::Mini"
+            or croak "Unable to tie";
         my $self = Parrot::Ops2c::Utils->new( {
             argv            => [ @ARGV ],
             flag            => {},
@@ -68,7 +69,8 @@
     
     {
         local @ARGV = qw( gobbledygook );
-        $tie = tie *STDERR, "Capture" or croak "Unable to tie";
+        $tie = tie *STDERR, "Parrot::IO::Capture::Mini"
+            or croak "Unable to tie";
         my $self = Parrot::Ops2c::Utils->new( {
             argv            => [ @ARGV ],
             flag            => {},
@@ -111,7 +113,8 @@
 
     {
         local @ARGV = qw( C );
-        $tie = tie *STDERR, "Capture" or croak "Unable to tie";
+        $tie = tie *STDERR, "Parrot::IO::Capture::Mini"
+            or croak "Unable to tie";
         my $self = Parrot::Ops2c::Utils->new( {
             argv            => [ @ARGV ],
         } );
@@ -161,6 +164,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<01-new.t> tests whether C<Parrot::Ops2c::Utils::new()> 
 works properly.
 

Modified: branches/buildtools/t/tools/ops2cutils/02-usage.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/02-usage.t   (original)
+++ branches/buildtools/t/tools/ops2cutils/02-usage.t   Wed Feb 21 20:30:37 2007
@@ -20,16 +20,15 @@
 use Test::More tests =>  30;
 use Carp;
 use Cwd;
-use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
-
+use_ok( "Parrot::IO::Capture::Mini" );
 use_ok( 'Parrot::Ops2c::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";
     my $rv = Usage();
     $msg = $tie->READLINE;
     untie *STDERR or croak "Unable to untie";
@@ -119,6 +118,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<02-usage.t> tests whether C<Parrot::Ops2c::Auxiliary::Usage()> 
 and F<getoptions()> work properly.
 

Modified: branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t     
(original)
+++ branches/buildtools/t/tools/ops2cutils/03-print_c_header_file.t     Wed Feb 
21 20:30:37 2007
@@ -17,14 +17,13 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests =>  26;
+use Test::More tests =>  25;
 use Carp;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -37,7 +36,6 @@
 
 ok(chdir $main::topdir, "Positioned at top-level Parrot directory");
 my $cwd = cwd();
-my ($msg, $tie);
 
 {
     my $tdir = tempdir( CLEANUP => 1 );
@@ -112,8 +110,14 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
-F<04-print_c_header_file.t> tests whether 
-C<Parrot::Ops2c::Utils::print_c_header_file()> work properly.
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
+F<03-print_c_header_file.t> tests whether 
+C<Parrot::Ops2c::Utils::print_c_header_file()> works properly.
 
 =head1 AUTHOR
 
@@ -124,20 +128,3 @@
 Parrot::Ops2c::Auxiliary, F<ops2c.pl>.
 
 =cut
-
-__END__
-
-#$VAR1 = [];
-#$VAR2 = bless( {
-#                 'split_count' => 0
-#               }, 'Parrot::OpTrans::CSwitch' );
-#$VAR3 = '_switch';
-#/usr/local/bin/perl tools/build/vtable_extend.pl
-#/usr/local/bin/perl tools/build/ops2c.pl CGoto --core
-#$VAR1 = [];
-#$VAR2 = bless( {}, 'Parrot::OpTrans::CGoto' );
-#$VAR3 = '_cg';
-#/usr/local/bin/perl tools/build/ops2c.pl CGP --core
-#$VAR1 = [];
-#$VAR2 = bless( {}, 'Parrot::OpTrans::CGP' );
-#$VAR3 = '_cgp';

Modified: branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t      
(original)
+++ branches/buildtools/t/tools/ops2cutils/04-print_c_source_top.t      Wed Feb 
21 20:30:37 2007
@@ -17,14 +17,13 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests =>  12;
+use Test::More tests =>  11;
 use Carp;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -37,7 +36,6 @@
 
 ok(chdir $main::topdir, "Positioned at top-level Parrot directory");
 my $cwd = cwd();
-my ($msg, $tie);
 
 {
     my $tdir = tempdir( CLEANUP => 1 );
@@ -91,6 +89,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<04-print_c_source_top.t> tests whether 
 C<Parrot::Ops2c::Utils::print_c_source_top()> work properly.
 

Modified: branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t   
(original)
+++ branches/buildtools/t/tools/ops2cutils/05-print_c_source_bottom.t   Wed Feb 
21 20:30:37 2007
@@ -17,14 +17,13 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests =>  15;
+use Test::More tests =>  14;
 use Carp;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -115,6 +114,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<05-print_c_source_bottom.t> tests whether 
 C<Parrot::Ops2c::Utils::print_c_source_bottom()> work properly.
 

Modified: branches/buildtools/t/tools/ops2cutils/06-dynamic.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/06-dynamic.t (original)
+++ branches/buildtools/t/tools/ops2cutils/06-dynamic.t Wed Feb 21 20:30:37 2007
@@ -23,8 +23,8 @@
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
+use_ok( 'Parrot::IO::Capture::Mini' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -67,7 +67,8 @@
     test_dynops( [ qw( CSwitch  dan.ops ) ] );
 
     {
-        $tie = tie *STDERR, "Capture" or croak "Unable to tie";
+        $tie = tie *STDERR, "Parrot::IO::Capture::Mini"
+            or croak "Unable to tie";
         my $self = Parrot::Ops2c::Utils->new( {
             argv            => [ qw( CSwitch  dan.ops dan.ops ) ],
             flag            => { dynamic => 1 },
@@ -143,6 +144,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<06-dynamic.t> tests how well 
 C<Parrot::Ops2c::Utils()> works when the C<--dynamic> flag is passed to
 F<tools/build/ops2c.pl>.

Modified: branches/buildtools/t/tools/ops2cutils/07-make_incdir.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/07-make_incdir.t     (original)
+++ branches/buildtools/t/tools/ops2cutils/07-make_incdir.t     Wed Feb 21 
20:30:37 2007
@@ -17,16 +17,14 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests =>   9;
+use Test::More tests =>   7;
 use Carp;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib", "./lib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
-use_ok( "Parrot::Ops2pm::Utils" );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
 src/ops/debug.ops src/ops/experimental.ops src/ops/io.ops src/ops/math.ops
@@ -38,7 +36,6 @@
 
 ok(chdir $main::topdir, "Positioned at top-level Parrot directory");
 my $cwd = cwd();
-my ($msg, $tie);
 
 {
     my $tdir = tempdir( CLEANUP => 1 );
@@ -128,6 +125,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<07-make_incdir.t> tests whether C<Parrot::Ops2c::Utils::new()> 
 works properly when F<include/parrot/oplib> was not previously created..
 

Modified: branches/buildtools/t/tools/ops2cutils/08-nolines.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/08-nolines.t (original)
+++ branches/buildtools/t/tools/ops2cutils/08-nolines.t Wed Feb 21 20:30:37 2007
@@ -17,14 +17,13 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests =>  15;
+use Test::More tests =>  14;
 use Carp;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -37,7 +36,6 @@
 
 ok(chdir $main::topdir, "Positioned at top-level Parrot directory");
 my $cwd = cwd();
-my ($msg, $tie);
 
 {
     my $tdir = tempdir( CLEANUP => 1 );
@@ -96,6 +94,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<08-nolines.t> tests whether 
 C<Parrot::Ops2c::Utils::new()> work properly when C<--nolines> option 
 is passed to F<tools/build/ops2c.pl>.

Modified: branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t
==============================================================================
--- branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t (original)
+++ branches/buildtools/t/tools/ops2cutils/09-dynamic_nolines.t Wed Feb 21 
20:30:37 2007
@@ -17,14 +17,13 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests =>  64;
+use Test::More tests =>  63;
 use Carp;
 use Cwd;
 use File::Copy;
 use File::Temp (qw| tempdir |);
 use_ok( 'Parrot::Ops2pm::Utils' );
 use lib ("$main::topdir/t/tools/ops2cutils/testlib");
-use_ok( "Capture" );
 use_ok( "GenerateCore", qw| generate_core | );
 
 my @srcopsfiles = qw( src/ops/core.ops src/ops/bit.ops src/ops/cmp.ops
@@ -39,7 +38,6 @@
 
 ok(chdir $main::topdir, "Positioned at top-level Parrot directory");
 my $cwd = cwd();
-my ($msg, $tie);
 
 {
     my $tdir = tempdir( CLEANUP => 1 );
@@ -114,6 +112,12 @@
 That functionality has largely been extracted 
 into the methods of F<Utils.pm>.
 
+All the files in this directory are intended to be run B<after>
+F<Configure.pl> has been run but before F<make> has been called.  Hence, they
+are B<not> part of the test suite run by F<make test>.   Once you have run
+F<Configure.pl>, however, you may run these tests as part of F<make
+buildtools_tests>.
+
 F<09-dynamic_nolines.t> tests whether 
 C<Parrot::Ops2c::Utils::new()> work properly when the C<--nolines> and
 C<--dynamic> options are passed to F<tools/build/ops2c.pl>.

Reply via email to