diff options
author | Jay Berkenbilt <ejb@ql.org> | 2021-03-02 12:28:55 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2021-03-04 21:08:36 +0100 |
commit | d7ffdfa994e3648a1e03fd1c1796c6e24bf00693 (patch) | |
tree | 85521183568aac361d82a78887a4161c8c545fc6 /qpdf/qtest/qpdf.test | |
parent | e17585c2d2df9fea296364c0768c2ce5adbc4b91 (diff) | |
download | qpdf-d7ffdfa994e3648a1e03fd1c1796c6e24bf00693.tar.zst |
Add optional conflict detection to mergeResources
Also improve behavior around direct vs. indirect resources.
Diffstat (limited to 'qpdf/qtest/qpdf.test')
-rw-r--r-- | qpdf/qtest/qpdf.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test index c8c841e3..5f003623 100644 --- a/qpdf/qtest/qpdf.test +++ b/qpdf/qtest/qpdf.test @@ -1598,7 +1598,7 @@ $td->runtest("merge dictionary", $td->NORMALIZE_NEWLINES); $td->runtest("unique resource name", {$td->COMMAND => "test_driver 60 minimal.pdf"}, - {$td->STRING => "test 60 done\n", $td->EXIT_STATUS => 0}, + {$td->FILE => "test60.out", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); $td->runtest("check output", {$td->FILE => "a.pdf"}, |