Merge pull request #25 from cxw42/capture-tests

Rework tests to run more cleanly in a sandbox.  v0.500.1.

Author: cxw42

.gitignore

@@ -2,6 +2,8 @@
 /tags
 /fatlib
 /stuff
+*.stackdump
+core
 
 # Dist
 /Text-PerlPP*

MANIFEST

@@ -9,9 +9,10 @@ pack.PL				Script to make the packed version
 README
 README.md			The tutorial
 t/00-load.t
-t/01-basic.t
-t/01-readme.t
-t/02-cmdline.t
+t/01-capture.t
+t/02-basic.t
+t/02-readme.t
+t/03-cmdline.t
 t/03-idempotency.t
 t/04-include.t
 t/05-external-command.t
@@ -21,5 +22,7 @@ t/a.txt
 t/b.txt
 t/c.txt
 t/included.txt
+t/lib/PerlPPTest.pm		The test kit
+t/lib/TestcaseList.pm		Helper library for autonumbering testcases
 t/multiline.txt
 t/unclosed.txt

MANIFEST.SKIP

@@ -75,6 +75,4 @@
 # Skip some specific files
 ^Makefile-premodule
 ^tags
-
-# Things we're still working on
-^t\/lib
+\.stackdump$

Makefile.PL

@@ -2,20 +2,38 @@ use 5.010;
 use strict;
 use warnings;
 use ExtUtils::MakeMaker;
+use Config;
 
-sub MY::postamble {
+# Get the filename of the Perl interpreter running this.  Modified from perlvar.
+# The -x test is for cygwin or other systems where $Config{perlpath} has no
+# extension and $Config{_exe} is nonempty.  E.g., symlink perl->perl5.10.1.exe.
+# There is no "perl.exe" on such a system.
+sub get_perl_filename {
+    my $secure_perl_path = $Config{perlpath};
+    if ($^O ne 'VMS') {
+        $secure_perl_path .= $Config{_exe}
+            unless (-x $secure_perl_path) ||
+                            ($secure_perl_path =~ m/$Config{_exe}$/i);
+    }
+    return $secure_perl_path;
+} # get_perl_filename()
+
+my $secure_perl_path = get_perl_filename();
+
+sub MY::postamble {     # TODO also handle Windows nmake syntax (SET vs. export)
     return <<EOT;
 authortest:
 \tRELEASE_TESTING=1 prove -l xt"
 
 testhere:   # Run the tests from lib rather than blib
-\texport PERLPP_CMD="perl -Ilib bin/perlpp"; \\
-\tperl -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
+\t"$secure_perl_path" -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
 
-testpacked: pack    # Test the packed version
-\texport PERLPP_NOUSE=1 PERLPP_CMD="perl blib/perlpp"; \\
-\tperl -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
+testpacked: pack    # Test the packed version.
+\tPERLPP_NOUSE=1 PERLPP_PERLOPTS="blib/perlpp" \\
+\t"$secure_perl_path" -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
 EOT
+    # Note: testpacked uses -Ilib so that I don't have to conditionally
+    # use Text::PerlPP in t/lib/PerlPPTest.pm.
 } #postamble
 
 WriteMakefile(
@@ -32,8 +50,17 @@ WriteMakefile(
     },
     BUILD_REQUIRES => {
         'App::FatPacker' => '0',
+    },
+    TEST_REQUIRES => {
+        'Capture::Tiny' => '0',
+        'Carp' => '0',
+        'Config' => '0',
+        'File::Spec' => '0',
         'IPC::Run3' => '0',
+        'rlib' => '0',
         'Test::More' => '0',
+        'Text::ParseWords' => '0',
+        'Text::Diff' => '0',   # for t/03-idempotency.t
     },
     PREREQ_PM => {
         'Getopt::Long'     => '2.5',    # Per issue #17

bin/perlpp

@@ -2,7 +2,7 @@
 # To run this manually from the source tree, do
 #     perl -Ilib bin/perlpp
 use strict; use warnings; use Text::PerlPP;
-exit(Text::PerlPP::Main(\@ARGV));
+exit(Text::PerlPP->new->Main(\@ARGV));
 __END__
 # ### Documentation #######################################################