aboutsummaryrefslogtreecommitdiffstats
path: root/qpdf/qtest
diff options
context:
space:
mode:
Diffstat (limited to 'qpdf/qtest')
-rw-r--r--qpdf/qtest/qpdf.test15
-rw-r--r--qpdf/qtest/qpdf/bad30-recover.out6
-rw-r--r--qpdf/qtest/qpdf/bad30.out6
-rw-r--r--qpdf/qtest/qpdf/bad33-recover.out6
-rw-r--r--qpdf/qtest/qpdf/c-write-errors.out5
-rw-r--r--qpdf/qtest/qpdf/c-write-warnings.out (renamed from qpdf/qtest/qpdf/c-write-warnings-and-errors.out)7
6 files changed, 26 insertions, 19 deletions
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index d69ccdc2..8378e7b3 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -787,7 +787,7 @@ my @badfiles = ("not a PDF file", # 1
"bad dictionary key", # 36
);
-$n_tests += @badfiles + 4;
+$n_tests += @badfiles + 3;
# Test 6 contains errors in the free table consistency, but we no
# longer have any consistency check for this since it is not important
@@ -796,7 +796,7 @@ $n_tests += @badfiles + 4;
# non-fatal.
my %badtest_overrides = (6 => 0, 12 => 0, 13 => 0,
14 => 0, 15 => 0, 17 => 0,
- 28 => 0, 31 => 0, 36 => 0);
+ 28 => 0, 30 => 0, 31 => 0, 36 => 0);
for (my $i = 1; $i <= scalar(@badfiles); ++$i)
{
my $status = $badtest_overrides{$i};
@@ -813,14 +813,9 @@ $td->runtest("C API: errors",
{$td->FILE => "c-read-errors.out",
$td->EXIT_STATUS => 0},
$td->NORMALIZE_NEWLINES);
-$td->runtest("C API: errors writing",
- {$td->COMMAND => "qpdf-ctest 2 bad30.pdf '' a.pdf"},
- {$td->FILE => "c-write-errors.out",
- $td->EXIT_STATUS => 0},
- $td->NORMALIZE_NEWLINES);
-$td->runtest("C API: errors and warnings writing",
+$td->runtest("C API: warnings writing",
{$td->COMMAND => "qpdf-ctest 2 bad33.pdf '' a.pdf"},
- {$td->FILE => "c-write-warnings-and-errors.out",
+ {$td->FILE => "c-write-warnings.out",
$td->EXIT_STATUS => 0},
$td->NORMALIZE_NEWLINES);
$td->runtest("C API: no recovery",
@@ -840,7 +835,7 @@ $n_tests += @badfiles + 8;
# though in some cases it may. Acrobat Reader would not be able to
# recover any of these files any better.
my %recover_failures = ();
-for (1, 7, 16, 18..21, 24, 29..30, 33, 35)
+for (1, 7, 16, 18..21, 24, 29, 35)
{
$recover_failures{$_} = 1;
}
diff --git a/qpdf/qtest/qpdf/bad30-recover.out b/qpdf/qtest/qpdf/bad30-recover.out
index 5e228a58..dc59da20 100644
--- a/qpdf/qtest/qpdf/bad30-recover.out
+++ b/qpdf/qtest/qpdf/bad30-recover.out
@@ -3,4 +3,8 @@
Raw stream data:
x%11 b;t4| wXID8G>rQu O E:IWPlII)rp4~;As/҅jcszT.?u<*6
Uncompressed stream data:
-bad30.pdf (file position 629): stream filter type is not name or array
+WARNING: bad30.pdf (file position 629): stream filter type is not name or array
+Stream data is not filterable.
+unparse: 7 0 R
+unparseResolved: 7 0 R
+test 1 done
diff --git a/qpdf/qtest/qpdf/bad30.out b/qpdf/qtest/qpdf/bad30.out
index 5e228a58..fc0780c6 100644
--- a/qpdf/qtest/qpdf/bad30.out
+++ b/qpdf/qtest/qpdf/bad30.out
@@ -3,4 +3,8 @@
Raw stream data:
x%11 b;t4| wXID8G>rQu O E:IWPlII)rp4~;As/҅jcszT.?u<*6
Uncompressed stream data:
-bad30.pdf (file position 629): stream filter type is not name or array
+WARNING: bad30.pdf (file position 629): stream filter type is not name or array
+Stream data is not filterable.
+unparse: 7 0 R
+unparseResolved: 7 0 R
+test 0 done
diff --git a/qpdf/qtest/qpdf/bad33-recover.out b/qpdf/qtest/qpdf/bad33-recover.out
index 7cb645a7..2269cd41 100644
--- a/qpdf/qtest/qpdf/bad33-recover.out
+++ b/qpdf/qtest/qpdf/bad33-recover.out
@@ -6,4 +6,8 @@ WARNING: bad33.pdf: Attempting to reconstruct cross-reference table
Raw stream data:
x%11 b;t4| wXID8G>rQu O E:IWPlII)rp4~;As/҅jcszT.?u<*6
Uncompressed stream data:
-bad33.pdf (file position 629): stream filter type is not name or array
+WARNING: bad33.pdf (file position 629): stream filter type is not name or array
+Stream data is not filterable.
+unparse: 7 0 R
+unparseResolved: 7 0 R
+test 1 done
diff --git a/qpdf/qtest/qpdf/c-write-errors.out b/qpdf/qtest/qpdf/c-write-errors.out
deleted file mode 100644
index 211cfdf9..00000000
--- a/qpdf/qtest/qpdf/c-write-errors.out
+++ /dev/null
@@ -1,5 +0,0 @@
-error: bad30.pdf (file position 629): stream filter type is not name or array
- code: 5
- file: bad30.pdf
- pos : 629
- text: stream filter type is not name or array
diff --git a/qpdf/qtest/qpdf/c-write-warnings-and-errors.out b/qpdf/qtest/qpdf/c-write-warnings.out
index d486d599..bc412658 100644
--- a/qpdf/qtest/qpdf/c-write-warnings-and-errors.out
+++ b/qpdf/qtest/qpdf/c-write-warnings.out
@@ -13,7 +13,12 @@ warning: bad33.pdf: Attempting to reconstruct cross-reference table
file: bad33.pdf
pos : 0
text: Attempting to reconstruct cross-reference table
-error: bad33.pdf (file position 629): stream filter type is not name or array
+warning: bad33.pdf (file position 629): stream filter type is not name or array
+ code: 5
+ file: bad33.pdf
+ pos : 629
+ text: stream filter type is not name or array
+warning: bad33.pdf (file position 629): stream filter type is not name or array
code: 5
file: bad33.pdf
pos : 629