Commit c7477e205e70390c6e97f3edef7a65c676c47f4f
1 parent
fffc461a
remove locale assumptions
git-svn-id: svn+q:///qpdf/trunk@612 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
3 changed files
with
16 additions
and
27 deletions
TODO
qpdf/fix-qdf
qpdf/qtest/qpdf.test
| ... | ... | @@ -216,7 +216,7 @@ my @goodfiles = ("implicit null", # 1 |
| 216 | 216 | "lots of compressible objects", # 20 |
| 217 | 217 | ); |
| 218 | 218 | |
| 219 | -$n_tests += (9 * @goodfiles) + 6; | |
| 219 | +$n_tests += (3 * @goodfiles) + 6; | |
| 220 | 220 | |
| 221 | 221 | my %goodtest_overrides = ('14' => 3); |
| 222 | 222 | my %goodtest_flags = |
| ... | ... | @@ -226,17 +226,14 @@ my %goodtest_flags = |
| 226 | 226 | for (my $i = 1; $i <= scalar(@goodfiles); ++$i) |
| 227 | 227 | { |
| 228 | 228 | my $n = $goodtest_overrides{$i} || 1; |
| 229 | - foreach my $lang (qw(C en_US en_US.UTF-8)) | |
| 230 | - { | |
| 231 | - $td->runtest("$goodfiles[$i-1], ($lang)", | |
| 232 | - {$td->COMMAND => "test_driver $n good$i.pdf"}, | |
| 233 | - {$td->FILE => "good$i.out", | |
| 234 | - $td->EXIT_STATUS => 0}); | |
| 235 | - my $xflags = $goodtest_flags{$i} || ''; | |
| 236 | - check_pdf("create qdf", | |
| 237 | - "qpdf --static-id -qdf $xflags good$i.pdf", | |
| 238 | - "good$i.qdf", 0); | |
| 239 | - } | |
| 229 | + $td->runtest("$goodfiles[$i-1]", | |
| 230 | + {$td->COMMAND => "test_driver $n good$i.pdf"}, | |
| 231 | + {$td->FILE => "good$i.out", | |
| 232 | + $td->EXIT_STATUS => 0}); | |
| 233 | + my $xflags = $goodtest_flags{$i} || ''; | |
| 234 | + check_pdf("create qdf", | |
| 235 | + "qpdf --static-id -qdf $xflags good$i.pdf", | |
| 236 | + "good$i.qdf", 0); | |
| 240 | 237 | } |
| 241 | 238 | |
| 242 | 239 | check_pdf("no normalization", |
| ... | ... | @@ -798,17 +795,14 @@ foreach my $file (@files) |
| 798 | 795 | show_ntests(); |
| 799 | 796 | # ---------- |
| 800 | 797 | $td->notify("--- fix-qdf Tests ---"); |
| 801 | -$n_tests += 6; | |
| 798 | +$n_tests += 2; | |
| 802 | 799 | |
| 803 | -foreach my $lang qw(C en_US en_US.UTF-8) | |
| 800 | +for (my $n = 1; $n <= 2; ++$n) | |
| 804 | 801 | { |
| 805 | - for (my $n = 1; $n <= 2; ++$n) | |
| 806 | - { | |
| 807 | - $td->runtest("fix-qdf $n (LANG=$lang)", | |
| 808 | - {$td->COMMAND => "LANG=$lang fix-qdf fix$n.qdf"}, | |
| 809 | - {$td->FILE => "fix$n.qdf.out", | |
| 810 | - $td->EXIT_STATUS => 0}); | |
| 811 | - } | |
| 802 | + $td->runtest("fix-qdf $n", | |
| 803 | + {$td->COMMAND => "fix-qdf fix$n.qdf"}, | |
| 804 | + {$td->FILE => "fix$n.qdf.out", | |
| 805 | + $td->EXIT_STATUS => 0}); | |
| 812 | 806 | } |
| 813 | 807 | |
| 814 | 808 | show_ntests(); | ... | ... |