Cleaned up test cases

Almost done with #24 - still need to test on Perl 5.10.1.

Author: Chris White

.gitignore

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

MANIFEST.SKIP

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

t/02-basic.t

@@ -4,9 +4,6 @@ use rlib './lib';
 use PerlPPTest;
 
 use IPC::Run3;
-#use constant CMD => ($ENV{PERLPP_CMD} || "$^X -Iblib/lib blib/script/perlpp");
-#	# TODO use $^X even if a PERLPP_CMD is provided.
-#diag "perlpp command: " . CMD;
 (my $whereami = __FILE__) =~ s/02-basic\.t$//;
 #diag join(' ', 'File is', __FILE__, 'whereami', $whereami);
 

t/02-readme.t

@@ -1,6 +1,5 @@
 #!/usr/bin/env perl
 # Tests from perlpp's README.md and bin/perlpp's POD.
-use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 use rlib './lib';
 use PerlPPTest;
 
@@ -95,7 +94,6 @@ for my $lrTest (@testcases) {
 	my ($testin, $refout, $referr) = @$lrTest;
 	my ($in, $out, $err);
 
-	#run3 CMD, \$testin, \$out, \$err;
 	run_perlpp [], \$testin, \$out, \$err;
 
 	if(defined $refout) {

t/03-cmdline.t

@@ -1,115 +1,109 @@
 #!/usr/bin/env perl
 # Tests of perlpp command-line options
-use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 use rlib './lib';
 use PerlPPTest;
+use TestcaseList;
 
-# Note: for all the L() calls, without a do{} around them, the line number
-# from caller() is the line number where `my @testcases` occurs.
-# TODO find out if there's a better way than do{L()}.  Maybe an L that
-# takes a block that returns a list?  That might or might not work ---
-# syntactically,
-# 	perl -MData::Dumper -E 'sub L :prototype(&) { my $func=shift; my @x = &$func(); say Dumper(\@x); }; L{1,2}'
-# does work, but I don't know if it would have the right caller.
+# Testcase format:
+# [scalar filename/lineno (added by the TestcaseList code),
+# 	$cmdline_options, $in (the script), $out_re (expected output),
+#	$err_re (stderr output, if any)]
 
-my @testcases=(
-	# [scalar filename/lineno (added by L()),
-	# 	$cmdline_options, $in (the script), $out_re (expected output),
-	#	$err_re (stderr output, if any)]
+# TODO add skip() to TestcaseList loader --- otherwise the line numbers
+# will be off here.
 
+my $testcases = TestcaseList->new(__LINE__);
 	# version
-	do{L('-v','',qr/\bversion\b/) },
-	do{L('--version','',qr/\bversion\b/)},
+$testcases->load('-v','',qr/\bversion\b/)->
+	('--version','',qr/\bversion\b/)
 
 	# Debug output
-	L('-d','',qr/^package PPP_[0-9]*;/m),
-	L('-d', '<?= 2+2 ?>', qr{print\s+2\+2\s*;}),
-	L('--debug', '<?= 2+2 ?>', qr{print\s+2\+2\s*;}),
-	L('-E', '<?= 2+2 ?>', qr{print\s+2\+2\s*;}),
+	('-d','',qr/^package PPP_[0-9]*;/m)
+	('-d', '<?= 2+2 ?>', qr{print\s+2\+2\s*;})
+	('--debug', '<?= 2+2 ?>', qr{print\s+2\+2\s*;})
+	('-E', '<?= 2+2 ?>', qr{print\s+2\+2\s*;})
 
 	# Usage
-	L('-h --z_noexit_on_help', '', qr/^Usage/),
-	L('--help --z_noexit_on_help', '', qr/^Usage/),
+	('-h --z_noexit_on_help', '', qr/^Usage/)
+	('--help --z_noexit_on_help', '', qr/^Usage/)
 
 	# Eval at start of file
-	L('-e \'my $foo=42;\'', '<?= $foo ?>', qr/^42$/),
-	L('--eval \'my $foo=42;\'','<?= $foo ?>', qr/^42$/),
-	L('-d -e \'my $foo=42;\'','<?= $foo ?>', qr/^my \$foo=42;/m),
-	L('--debug --eval \'my $foo=42;\'','<?= $foo ?>', qr/^print\s+\$foo\s*;/m),
+	(['-e', q(my $foo=42;)], '<?= $foo ?>', qr/^42$/)
+	(['--eval', q(my $foo=42;)],'<?= $foo ?>', qr/^42$/)
+	(['-d','-e', q(my $foo=42;)],'<?= $foo ?>', qr/^my \$foo=42;/m)
+	(['--debug','--eval', q(my $foo=42;)],'<?= $foo ?>', qr/^print\s+\$foo\s*;/m)
 
 	# Definitions: name formats
-	L('-Dfoo', '<? print "yes" if $D{foo}; ?>',qr/^yes$/),
-	L('-Dfoo42', '<? print "yes" if $D{foo42}; ?>',qr/^yes$/),
-	L('-Dfoo_42', '<? print "yes" if $D{foo_42}; ?>',qr/^yes$/),
-	L('-D_x', '<? print "yes" if $D{_x}; ?>',qr/^yes$/),
-	L('-D_1', '<? print "yes" if $D{_1}; ?>',qr/^yes$/),
+	('-Dfoo', '<? print "yes" if $D{foo}; ?>',qr/^yes$/)
+	('-Dfoo42', '<? print "yes" if $D{foo42}; ?>',qr/^yes$/)
+	('-Dfoo_42', '<? print "yes" if $D{foo_42}; ?>',qr/^yes$/)
+	('-D_x', '<? print "yes" if $D{_x}; ?>',qr/^yes$/)
+	('-D_1', '<? print "yes" if $D{_1}; ?>',qr/^yes$/)
 
 	# Definitions with --define
-	L('--define foo', '<? print "yes" if $D{foo}; ?>',qr/^yes$/),
-	L('--define foo=42 --define bar=127', '<?= $D{foo} * $D{bar} ?>',qr/^5334$/),
+	('--define foo', '<? print "yes" if $D{foo}; ?>',qr/^yes$/)
+	('--define foo=42 --define bar=127', '<?= $D{foo} * $D{bar} ?>',qr/^5334$/)
 
 	# Definitions: :define/:undef
-	L('','<?:define foo?><?:ifdef foo?>yes<?:else?>no<?:endif?>',qr/^yes$/),
-	L('','<?:define foo 42?><?:ifdef foo?>yes<?:else?>no<?:endif?>',qr/^yes$/),
-	L('','<?:define foo 42?><?= $D{foo} ?>',qr/^42$/),
-	L('','<?:define foo "a" . "b" ?><?= $D{foo} ?>',qr/^ab$/),
-	L('-Dfoo','<?:undef foo?><?:ifdef foo?>yes<?:else?>no<?:endif?>',qr/^no$/),
+	('','<?:define foo?><?:ifdef foo?>yes<?:else?>no<?:endif?>',qr/^yes$/)
+	('','<?:define foo 42?><?:ifdef foo?>yes<?:else?>no<?:endif?>',qr/^yes$/)
+	('','<?:define foo 42?><?= $D{foo} ?>',qr/^42$/)
+	('','<?:define foo "a" . "b" ?><?= $D{foo} ?>',qr/^ab$/)
+	('-Dfoo','<?:undef foo?><?:ifdef foo?>yes<?:else?>no<?:endif?>',qr/^no$/)
 
 	# Definitions: values
-	L('-Dfoo=41025.5', '<?= $D{foo} ?>',qr/^41025.5$/),
-	L('-D foo=2017', '<?= $D{foo} ?>',qr/^2017$/),
-	L('-D foo=\"blah\"', '<?= $D{foo} ?>',qr/^blah$/),
+	('-Dfoo=41025.5', '<?= $D{foo} ?>',qr/^41025.5$/)
+	('-D foo=2017', '<?= $D{foo} ?>',qr/^2017$/)
+	([qw(-D foo="blah")], '<?= $D{foo} ?>',qr/^blah$/)
 		# Have to escape the double-quotes so perl sees it as a string
 		# literal instead of a bareword.
-	L('-D foo=42 -D bar=127', '<?= $D{foo} * $D{bar} ?>',qr/^5334$/),
-	L('', '<? $D{x}="%D always exists even if empty"; ?><?= $D{x} ?>',
-		qr/^%D always exists even if empty$/),
+	('-D foo=42 -D bar=127', '<?= $D{foo} * $D{bar} ?>',qr/^5334$/)
+	('', '<? $D{x}="%D always exists even if empty"; ?><?= $D{x} ?>', qr/^%D always exists even if empty$/)
 
 	# Textual substitution
-	L('-Dfoo=42','<? my $foo; ?>foo',qr/^42$/ ),
-	L('-Dfoo=\'"a phrase"\'','<? my $foo; ?>foo',qr/^a phrase$/ ),
-	L('-Dfoo=\"bar\"','_foo foo foobar barfoo',qr/^_foo bar foobar barfoo$/ ),
-	L('-Dfoo=\"bar\" --define barfoo','_foo foo foobar barfoo',
-		qr/^_foo bar foobar barfoo$/ ),
+	('-Dfoo=42','<? my $foo; ?>foo',qr/^42$/ )
+	([q(-Dfoo="a phrase")],'<? my $foo; ?>foo',qr/^a phrase$/ )
+	(['-Dfoo="bar"'], '_foo foo foobar barfoo 1',qr/^_foo bar foobar barfoo 1$/ )
+	(['-Dfoo="bar"', '--define', 'barfoo'], '_foo foo foobar barfoo 2', qr/^_foo bar foobar barfoo 2$/ )
 
 	# Sets, which do not textually substitute
-	do{L('-sfoo=42','<? my $foo; ?>foo',qr/^foo$/ )},
-	do{L('-sfoo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ )},
-	[__LINE__, '--set foo=42','<? my $foo; ?>foo',qr/^foo$/ ],
-	do{L('--set foo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ )},
+	('-sfoo=42','<? my $foo; ?>foo',qr/^foo$/ )
+	('-sfoo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ )
+	('--set foo=42','<? my $foo; ?>foo',qr/^foo$/ )
+	('--set foo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ )
 
 	# Conditionals
-	L('-Dfoo=42','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ ),
-	L('-Dfoo=2','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^yes$/ ),
-	L('-Dfoo','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ ),
-	L('-Dfoo','<?:if foo==1?>yes<?:else?>no<?:endif?>',qr/^yes$/ ),
+	('-Dfoo=42','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ )
+	('-Dfoo=2','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^yes$/ )
+	('-Dfoo','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ )
+	('-Dfoo','<?:if foo==1?>yes<?:else?>no<?:endif?>',qr/^yes$/ )
 		# The default value is true, which compares equal to 1.
-	L('-Dfoo','<?:if foo?>yes<?:else?>no<?:endif?>',qr/^yes$/ ),
-	L('','<?:if foo?>yes<?:else?>no<?:endif?>',qr/^no$/ ),
-	L('','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ ),
+	('-Dfoo','<?:if foo?>yes<?:else?>no<?:endif?>',qr/^yes$/ )
+	('','<?:if foo?>yes<?:else?>no<?:endif?>',qr/^no$/ )
+	('','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ )
 		# For consistency, all :if tests evaluate to false if the
 		# named variable is not defined.
 
 	# Undefining
-	L('-Dfoo','<?:undef foo?><?:if foo?>yes<?:else?>no<?:endif?>',qr/^no$/ ),
+	('-Dfoo','<?:undef foo?><?:if foo?>yes<?:else?>no<?:endif?>',qr/^no$/ )
 	#
 	# Three forms of elsif
-	L('', '<?:if foo eq "1" ?>yes<?:elif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/),
-	L('', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/),
-	L('', '<?:if foo eq "1" ?>yes<?:elseif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/),
+	('', '<?:if foo eq "1" ?>yes<?:elif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/)
+	('', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/)
+	('', '<?:if foo eq "1" ?>yes<?:elseif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/)
 
 	# elsif with definitions
-	L('-Dfoo', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^yes$/),
-	L('-Dfoo=1', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^yes$/),
+	('-Dfoo', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^yes$/)
+	('-Dfoo=1', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^yes$/)
 		# Automatic conversion of numeric 1 to string in "eq" context
-	L('-Dfoo=\\"x\\"', '<?= $D{foo} . "\n" ?><?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^x\nmaybe$/),
-	L('-Dfoo=\\"y\\"', '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/),
+	(['-Dfoo="x"'], '<?= $D{foo} . "\n" ?><?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^x\nmaybe$/)
+	(['-Dfoo="y"'], '<?:if foo eq "1" ?>yes<?:elsif foo eq "x" ?>maybe<?:else?>no<?:endif?>', qr/^no$/)
 
-); #@testcases
+; #$testcases
 
-plan tests => count_tests(\@testcases, 3, 4);
+plan tests => count_tests($testcases->arr, 3, 4);
 
-for my $lrTest (@testcases) {
+for my $lrTest (@{$testcases->arr}) {
 	my ($where, $opts, $testin, $out_re, $err_re) = @$lrTest;
 
 	my ($out, $err);

t/04-include.t

@@ -33,7 +33,7 @@ plan tests => count_tests(\@testcases, 2, 3);
 
 for my $lrTest (@testcases) {
 	my ($lineno, $testin, $refout, $referr) = @$lrTest;
-	diag "<<<@{[Text::PerlPP::_QuoteString $testin]}";
+	#diag "<<<@{[Text::PerlPP::_QuoteString $testin]}";
 	run_perlpp [], \$testin, \$out, \$err;
 
 	if(defined $refout) {

t/05-external-command.t

@@ -28,7 +28,7 @@ for my $lrTest (@testcases) {
 	my ($opts, $testin, $out_re, $err_re) = @$lrTest;
 
 	my ($out, $err);
-	diag "perlpp $opts <<<@{[Text::PerlPP::_QuoteString $testin]}";
+	#diag "perlpp $opts <<<@{[Text::PerlPP::_QuoteString $testin]}";
 	run_perlpp $opts, \$testin, \$out, \$err;
 
 	if(defined $out_re) {

t/06-macro.t

@@ -2,7 +2,6 @@
 # Tests of perlpp :macro and related
 use rlib './lib';
 use PerlPPTest;
-use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 
 (my $whereami = __FILE__) =~ s/06-macro\.t$//;
 my $incfn = '\"' . $whereami . 'included.txt\"';

t/07-invalid.t

@@ -2,9 +2,7 @@
 # Testing perlpp with invalid input
 use rlib './lib';
 use PerlPPTest;
-#use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 (my $whereami = __FILE__) =~ s/07-invalid\.t$//;
-#diag "perlpp command " . CMD . "; whereami $whereami.";
 
 my ($out, $err);