chiark
/
gitweb
/
~ianmdlvl
/
matchsticks-search.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc382c8
)
Fix the test script.
master
author
Simon Tatham
<anakin@pobox.com>
Tue, 22 Apr 2014 13:39:21 +0000
(14:39 +0100)
committer
Simon Tatham
<anakin@pobox.com>
Tue, 22 Apr 2014 13:39:21 +0000
(14:39 +0100)
test.pl
patch
|
blob
|
history
diff --git
a/test.pl
b/test.pl
index ec92fa95a6e40df3de15604c2ce6c12c3f026351..d68dd9e60e42b25b2fa29fae42c7dd4f80c1b51a 100755
(executable)
--- a/
test.pl
+++ b/
test.pl
@@
-15,16
+15,16
@@
die "usage: test.pl [-v] [-c COMMAND]\n" unless GetOptions(
&runtest(4,2,"2");
&runtest(4,3,"1");
&runtest(5,2,"1");
&runtest(4,2,"2");
&runtest(4,3,"1");
&runtest(5,2,"1");
-&runtest(5,3,"
1.25
");
-&runtest(5,4,"
1.5
");
+&runtest(5,3,"
5/4
");
+&runtest(5,4,"
3/2
");
&runtest(6,2,"2");
&runtest(6,3,"3");
&runtest(6,4,"2");
&runtest(6,5,"2");
&runtest(7,2,"1");
&runtest(6,2,"2");
&runtest(6,3,"3");
&runtest(6,4,"2");
&runtest(6,5,"2");
&runtest(7,2,"1");
-&runtest(7,3,"
1.25
");
-&runtest(7,4,"
1.66667
");
-&runtest(7,5,"
1.66667
");
+&runtest(7,3,"
5/4
");
+&runtest(7,4,"
5/3
");
+&runtest(7,5,"
5/3
");
print "ok\n";
sub runtest {
print "ok\n";
sub runtest {
@@
-43,7
+43,7
@@
sub singletest {
my $firstline = <$pipe>;
chomp($firstline);
die "$cmd: first line of output not as expected:\n$firstline\n"
my $firstline = <$pipe>;
chomp($firstline);
die "$cmd: first line of output not as expected:\n$firstline\n"
- unless $firstline =~ /^(\d+) into (\d+): min fragment ([\d\.e\+\-]+)/;
+ unless $firstline =~ /^(\d+) into (\d+): min fragment ([\d\.e\+\-
\/
]+)/;
die "$cmd: min fragment $3, expected $expected\n"
unless $3 eq $expected;
}
die "$cmd: min fragment $3, expected $expected\n"
unless $3 eq $expected;
}