Tests 05 and 06 run, as do some of 07

Author: Chris White

t/05-external-command.t

@@ -1,8 +1,10 @@
 #!/usr/bin/env perl
 # Tests of perlpp <?!...?> external commands
+#
+# TODO: On non-Unix, test only `echo` with no parameters.
+
 use rlib './lib';
 use PerlPPTest;
-use constant CMD => ($ENV{PERLPP_CMD} || 'perl -Iblib/lib blib/script/perlpp');
 
 (my $whereami = __FILE__) =~ s/macro\.t$//;
 my $incfn = '\"' . $whereami . 'included.txt\"';
@@ -26,8 +28,8 @@ for my $lrTest (@testcases) {
 	my ($opts, $testin, $out_re, $err_re) = @$lrTest;
 
 	my ($out, $err);
-	print STDERR CMD . " $opts", " <<<'", $testin, "'\n";
-	run3 CMD . " $opts", \$testin, \$out, \$err;
+	diag "perlpp $opts <<<@{[Text::PerlPP::_QuoteString $testin]}";
+	run_perlpp $opts, \$testin, \$out, \$err;
 
 	if(defined $out_re) {
 		like($out, $out_re);

t/06-macro.t

@@ -14,10 +14,10 @@ my @testcases=(
 	#	$err_re (stderr output, if any)]
 
 	# %Defs
-	['-D foo=42', '<?:macro say $Text::PerlPP::Defs{foo}; ?>', qr/^42/],
-	['-D incfile=' . $incfn , '<?:macro Include $Text::PerlPP::Defs{incfile}; ?>',
+	['-D foo=42', '<?:macro say $PSelf->{Defs}->{foo}; ?>', qr/^42/],
+	['-D incfile=' . $incfn , '<?:macro $PSelf->Include( $PSelf->{Defs}->{incfile} ); ?>',
 		qr/^a4b/],
-	['-s incfile=' . $incfn , '<?:macro Include $Text::PerlPP::Sets{incfile}; ?>',
+	['-s incfile=' . $incfn , '<?:macro $PSelf->Include( $PSelf->{Sets}->{incfile} ); ?>',
 		qr/^a4b/],
 	['', '<?:immediate say "print 128;"; ?>',qr/^128$/],
 
@@ -29,8 +29,8 @@ for my $lrTest (@testcases) {
 	my ($opts, $testin, $out_re, $err_re) = @$lrTest;
 
 	my ($out, $err);
-	print STDERR CMD . " $opts", " <<<'", $testin, "'\n";
-	run3 CMD . " $opts", \$testin, \$out, \$err;
+	diag "perlpp $opts", " <<<'", $testin, "'\n";
+	run_perlpp $opts, \$testin, \$out, \$err;
 
 	if(defined $out_re) {
 		like($out, $out_re);

t/07-invalid.t

@@ -44,14 +44,15 @@ for my $lrTest (@testcases) {
 		# by default, accept any stderr output as indicative of a failure
 		# (a successful test case).
 
-	run3 CMD, \$testin, \$out, \$err;
+	run_perlpp [], \$testin, \$out, \$err;
 	like($err, $err_re);
 
 } # foreach test
 
 for my $lrTest (@testcases2) {
 	my $err_re = shift @$lrTest;
-	run3 join(' ', CMD, @$lrTest), \undef, \undef, \$err;
+	diag join(' ',@$lrTest);
+	run_perlpp $lrTest, undef, undef, \$err;
 	like($err, $err_re);
 }