@INC = '../lib';
}
+# read in a file
+sub cat {
+ my $file = shift;
+ local $/;
+ open my $fh, $file or die "can't open '$file': $!";
+ my $data = <$fh>;
+ close $fh;
+ $data;
+}
+
#-- testing numeric fields in all variants (WL)
sub swrite {
}
my @NumTests = (
- [ '@###', 0, 1, 9999.5, 9999.4999, -999.5, 1e100 ],
- [ '@0##', 0, 1, 9999.5, -999.4999, -999.5, 1e100 ],
- [ '^###', 0, undef ],
- [ '^0##', 0, undef ],
- [ '@###.', 0, 1, 9999.5, 9999.4999, -999.5 ],
- [ '@##.##', 0, 1, 999.995, 999.99499, -100 ],
- [ '@0#.##', 0, 1, 10, -0.0001 ],
- );
-
-sub mkfmt($){
- my $fmt = shift();
- my $fieldwidth = length( $fmt );
- my $leadzero = $fmt =~ /^.0/ ? "0" : "";
- if( $fmt =~ /\.(#*)/ ){
- my $fractwidth = length( $1 );
- return "%#${leadzero}${fieldwidth}.${fractwidth}f"
- } else {
- return "%${leadzero}${fieldwidth}.0f"
- }
-}
+ # [ format, value1, expected1, value2, expected2, .... ]
+ [ '@###', 0, ' 0', 1, ' 1', 9999.6, '####',
+ 9999.4999, '9999', -999.6, '####', 1e+100, '####' ],
+
+ [ '@0##', 0, '0000', 1, '0001', 9999.6, '####',
+ -999.4999, '-999', -999.6, '####', 1e+100, '####' ],
+
+ [ '^###', 0, ' 0', undef, ' ' ],
+
+ [ '^0##', 0, '0000', undef, ' ' ],
+
+ [ '@###.', 0, ' 0.', 1, ' 1.', 9999.6, '#####',
+ 9999.4999, '9999.', -999.6, '#####' ],
+
+ [ '@##.##', 0, ' 0.00', 1, ' 1.00', 999.996, '######',
+ 999.99499, '999.99', -100, '######' ],
+
+ [ '@0#.##', 0, '000.00', 1, '001.00', 10, '010.00',
+ -0.0001, qr/^[\-0]00\.00$/ ],
+
+);
+
my $num_tests = 0;
for my $tref ( @NumTests ){
- $num_tests += @$tref - 1;
+ $num_tests += (@$tref - 1)/2;
}
#---------------------------------------------------------
my $bas_tests = 20;
# number of tests in section 3
-my $hmb_tests = 36;
+my $hmb_tests = 37;
printf "1..%d\n", $bas_tests + $num_tests + $hmb_tests;
-my $CAT = ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') ? 'type'
- : ($^O eq 'MacOS') ? 'catenate'
- : 'cat';
-
############
## Section 1
############
of huma...
now is the time for all good men to come to\n";
-if (`$CAT Op_write.tmp` eq $right)
+if (cat('Op_write.tmp') eq $right)
{ print "ok 1\n"; 1 while unlink 'Op_write.tmp'; }
else
{ print "not ok 1\n"; }
necessary
now is the time for all good men to come to\n";
-if (`$CAT Op_write.tmp` eq $right)
+if (cat('Op_write.tmp') eq $right)
{ print "ok 2\n"; 1 while unlink 'Op_write.tmp'; }
else
{ print "not ok 2\n"; }
necessary
now is the time for all good men to come to\n";
-if (`$CAT Op_write.tmp` eq $right)
+if (cat('Op_write.tmp') eq $right)
{ print "ok 3\n"; 1 while unlink 'Op_write.tmp'; }
else
{ print "not ok 3\n"; }
$right =
"fit\n";
-if (`$CAT Op_write.tmp` eq $right)
+if (cat('Op_write.tmp') eq $right)
{ print "ok 6\n"; 1 while unlink 'Op_write.tmp'; }
else
{ print "not ok 6\n"; }
open OUT4, ">Op_write.tmp" or die "Can't create Op_write.tmp";
write (OUT4);
close OUT4 or die "Could not close: $!";
-if (`$CAT Op_write.tmp` eq "1\n") {
+if (cat('Op_write.tmp') eq "1\n") {
print "ok 9\n";
1 while unlink "Op_write.tmp";
}
close OUT10 or die "Could not close: $!";
$right = " 12.95 00012.95\n";
-if (`$CAT Op_write.tmp` eq $right)
+if (cat('Op_write.tmp') eq $right)
{ print "ok 10\n"; 1 while unlink 'Op_write.tmp'; }
else
{ print "not ok 10\n"; }
"00012.95
1 0#
10 #\n";
-if (`$CAT Op_write.tmp` eq $right)
+if (cat('Op_write.tmp') eq $right)
{ print "ok 11\n"; 1 while unlink 'Op_write.tmp'; }
else
{ print "not ok 11\n"; }
write(OUT12);
}
close OUT12 or die "Could not close: $!";
- print `$CAT Op_write.tmp`;
+ print cat('Op_write.tmp');
}
open(OUT13, '>Op_write.tmp') || die "Can't create Op_write.tmp";
write(OUT13);
close OUT13 or die "Could not close: $!";
- print `$CAT Op_write.tmp`;
+ print cat('Op_write.tmp');
}
{ # test 14
# must fail since we have a trailing ; in the eval'ed string (WL)
my @v = ('k');
eval "format OUT14 = \n@\n\@v";
- print $@ ? "ok 14\n" : "not ok 14\n";
+ print +($@ && $@ =~ /Format not terminated/)
+ ? "ok 14\n" : "not ok 14 $@\n";
}
open(OUT15, '>Op_write.tmp') || die "Can't create Op_write.tmp";
write(OUT15);
close OUT15 or die "Could not close: $!";
- my $res = `$CAT Op_write.tmp`;
+ my $res = cat('Op_write.tmp');
print $res eq "line 1\nline 2\n" ? "ok 15\n" : "not ok 15\n";
}
open(OUT16, '>Op_write.tmp') || die "Can't create Op_write.tmp";
write(OUT16);
close OUT16 or die "Could not close: $!";
- my $res = `$CAT Op_write.tmp`;
+ my $res = cat('Op_write.tmp');
print $res eq <<EOD ? "ok 16\n" : "not ok 16\n";
this_is_block_1 this_is_block_2
this_is_block_3 this_is_block_4
open(OUT17, '>Op_write.tmp') || die "Can't create Op_write.tmp";
write(OUT17);
close OUT17 or die "Could not close: $!";
- my $res = `$CAT Op_write.tmp`;
+ my $res = cat('Op_write.tmp');
chomp( $txt );
my $exp = <<EOD;
Here we go: $txt That's all, folks!
.
open(OUT18, '>Op_write.tmp') || die "Can't create Op_write.tmp";
eval { write(OUT18); };
- print $@ ? "ok 18\n" : "not ok 18\n";
+ print +($@ && $@ =~ /Repeated format line will never terminate/)
+ ? "ok 18\n" : "not ok 18: $@\n";
close OUT18 or die "Could not close: $!";
}
'$v' . "\n.\n";
open(OUT19, '>Op_write.tmp') || die "Can't create Op_write.tmp";
write(OUT19);
- my $res = `$CAT Op_write.tmp`;
+ close OUT19 or die "Could not close: $!";
+ my $res = cat('Op_write.tmp');
print $res eq <<EOD ? "ok 19\n" : "not ok 19\n";
gaga\0
gaga\0
$exp .= "}\n";
open(OUT20, '>Op_write.tmp') || die "Can't create Op_write.tmp";
write(OUT20);
- my $res = `$CAT Op_write.tmp`;
+ close OUT20 or die "Could not close: $!";
+ my $res = cat('Op_write.tmp');
print $res eq $exp ? "ok 20\n" : "not ok 20 res=[$res]exp=[$exp]\n";
-
-EOD
}
my $nt = $bas_tests;
for my $tref ( @NumTests ){
my $writefmt = shift( @$tref );
- my $printfmt = mkfmt( $writefmt );
- my $blank_when_undef = substr( $writefmt, 0, 1 ) eq '^';
- for my $val ( @$tref ){
+ while (@$tref) {
+ my $val = shift @$tref;
+ my $expected = shift @$tref;
my $writeres = swrite( $writefmt, $val );
- my $printres;
- if( $blank_when_undef && ! defined($val) ){
- $printres = ' ' x length( $writefmt );
- } else {
- $printres = sprintf( $printfmt, $val || 0 );
- if( length($printres) > length( $writefmt ) ){
- $printres = '#' x length( $writefmt );
- }
- }
$nt++;
-
- print $printres eq $writeres ? "ok $nt\n" : "not ok $nt\n";
+ my $ok = ref($expected)
+ ? $writeres =~ $expected
+ : $writeres eq $expected;
+
+ print $ok
+ ? "ok $nt - $writefmt\n"
+ : "not ok $nt\n# f=[$writefmt] exp=[$expected] got=[$writeres]\n";
}
}
$test++;
}
select $oldfh;
+close STDOUT_DUP;
$^ = "STDOUT_TOP";
$= = 7; # Page length
my $bm = 2; # Bottom marging (empty lines between last text and footer)
my $lm = 4; # Left margin (indent in spaces)
-select ((select (STDOUT), $| = 1)[0]);
-if ($lm > 0 and !open STDOUT, "|-") { # Left margin (in this test ALWAYS set)
- select ((select (STDOUT), $| = 1)[0]);
+# -----------------------------------------------------------------------
+#
+# execute the rest of the script in a child process. The parent reads the
+# output from the child and compares it with <DATA>.
+
+my @data = <DATA>;
+
+select ((select (STDOUT), $| = 1)[0]); # flush STDOUT
+
+my $opened = open FROM_CHILD, "-|";
+unless (defined $opened) {
+ print "not ok $test - open gave $!\n"; exit 0;
+}
+
+if ($opened) {
+ # in parent here
+
+ print "ok $test - open\n"; $test++;
my $s = " " x $lm;
- while (<STDIN>) {
+ while (<FROM_CHILD>) {
+ unless (@data) {
+ print "not ok $test - too much output\n";
+ exit;
+ }
s/^/$s/;
- print + ($_ eq <DATA> ? "" : "not "), "ok ", $test++, "\n";
+ my $exp = shift @data;
+ print + ($_ eq $exp ? "" : "not "), "ok ", $test++, " \n";
+ if ($_ ne $exp) {
+ s/\n/\\n/g for $_, $exp;
+ print "#expected: $exp\n#got: $_\n";
}
- close STDIN;
- print + (<DATA>?"not ":""), "ok ", $test++, "\n";
- close STDOUT;
- exit;
}
+ close FROM_CHILD;
+ print + (@data?"not ":""), "ok ", $test++, " - too litle output\n";
+ exit;
+}
+
+# in child here
+
+ select ((select (STDOUT), $| = 1)[0]);
$tm = "\n" x $tm;
$= -= $bm + 1; # count one for the trailing "----"
my $lastmin = 0;
projects / p5sagit/p5-mst-13.2.git / blobdiff