Commit 22bcdbe786b5398d09fadae5c147359b9162293b
1 parent
1eb35a35
Remove acroread from tests
This hasn't worked or been exercised in years since Adobe stopped releasing a Linux version of reader.
Showing
4 changed files
with
7 additions
and
43 deletions
ChangeLog
| 1 | +2019-01-31 Jay Berkenbilt <ejb@ql.org> | ||
| 2 | + | ||
| 3 | + * Remove traces of acroread, which hasn't been available in Linux | ||
| 4 | + for a long time. | ||
| 5 | + | ||
| 1 | 2019-01-30 Jay Berkenbilt <ejb@ql.org> | 6 | 2019-01-30 Jay Berkenbilt <ejb@ql.org> |
| 2 | 7 | ||
| 3 | * Do not include space after ID operator in inline image data. The | 8 | * Do not include space after ID operator in inline image data. The |
ispell-words
manual/qpdf-manual.xml
| @@ -196,15 +196,6 @@ | @@ -196,15 +196,6 @@ | ||
| 196 | ghostscript. | 196 | ghostscript. |
| 197 | </para> | 197 | </para> |
| 198 | <para> | 198 | <para> |
| 199 | - If Adobe Reader is installed as <command>acroread</command>, some | ||
| 200 | - additional test cases will be enabled. These test cases simply | ||
| 201 | - verify that Adobe Reader can open the files that qpdf creates. | ||
| 202 | - They require version 8.0 or newer to pass. However, in order to | ||
| 203 | - avoid having qpdf depend on non-free (as in liberty) software, the | ||
| 204 | - test suite will still pass without Adobe reader, and the test | ||
| 205 | - suite still exercises the full functionality of the software. | ||
| 206 | - </para> | ||
| 207 | - <para> | ||
| 208 | Pre-built documentation is distributed with qpdf, so you should | 199 | Pre-built documentation is distributed with qpdf, so you should |
| 209 | generally not need to rebuild the documentation. In order to | 200 | generally not need to rebuild the documentation. In order to |
| 210 | build the documentation from its docbook sources, you need the | 201 | build the documentation from its docbook sources, you need the |
qpdf/qtest/qpdf.test
| @@ -30,18 +30,6 @@ if (defined($large_file_test_path)) | @@ -30,18 +30,6 @@ if (defined($large_file_test_path)) | ||
| 30 | $large_file_test_path =~ s!\\!/!g; | 30 | $large_file_test_path =~ s!\\!/!g; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | -my $have_acroread = 0; | ||
| 34 | - | ||
| 35 | -if ($compare_images) | ||
| 36 | -{ | ||
| 37 | - # check for working acroread | ||
| 38 | - if (system("acroread -toPostScript -pairs good1.pdf a.ps" . | ||
| 39 | - " >$devNull 2>&1") == 0) | ||
| 40 | - { | ||
| 41 | - $have_acroread = 1; | ||
| 42 | - } | ||
| 43 | -} | ||
| 44 | - | ||
| 45 | # These variables are used to store the total number of tests in the | 33 | # These variables are used to store the total number of tests in the |
| 46 | # test suite. NOTE: qtest's requirement to indicate the number of | 34 | # test suite. NOTE: qtest's requirement to indicate the number of |
| 47 | # tests serves as a check that the test suite is operating properly. | 35 | # tests serves as a check that the test suite is operating properly. |
| @@ -56,12 +44,9 @@ if ($compare_images) | @@ -56,12 +44,9 @@ if ($compare_images) | ||
| 56 | # compare_pdfs generates depends on the value of $compare_images. | 44 | # compare_pdfs generates depends on the value of $compare_images. |
| 57 | my $n_compare_pdfs = 0; | 45 | my $n_compare_pdfs = 0; |
| 58 | 46 | ||
| 59 | -# This should be set to the number of times we call acroread. | ||
| 60 | -my $n_acroread = 0; | ||
| 61 | - | ||
| 62 | # Each section of tests should increment this number by the number of | 47 | # Each section of tests should increment this number by the number of |
| 63 | -# tests they generate excluding calls to acroread or compare_pdfs, | ||
| 64 | -# which are tracked separately by $n_compare_pdfs and $n_acroread. | 48 | +# tests they generate excluding calls to compare_pdfs, which are |
| 49 | +# tracked separately by $n_compare_pdfs. | ||
| 65 | my $n_tests = 0; | 50 | my $n_tests = 0; |
| 66 | 51 | ||
| 67 | # Call show_ntests after each block of test cases. In show_ntests, | 52 | # Call show_ntests after each block of test cases. In show_ntests, |
| @@ -3634,7 +3619,6 @@ my @flags = (["-qdf", # 1 | @@ -3634,7 +3619,6 @@ my @flags = (["-qdf", # 1 | ||
| 3634 | 3619 | ||
| 3635 | $n_tests += 1 + (@files * @flags * 2 * 3); | 3620 | $n_tests += 1 + (@files * @flags * 2 * 3); |
| 3636 | $n_compare_pdfs += 1 + (@files * @flags * 2); | 3621 | $n_compare_pdfs += 1 + (@files * @flags * 2); |
| 3637 | -$n_acroread += (@files * @flags * 2); | ||
| 3638 | 3622 | ||
| 3639 | foreach my $file (@files) | 3623 | foreach my $file (@files) |
| 3640 | { | 3624 | { |
| @@ -3696,17 +3680,6 @@ foreach my $file (@files) | @@ -3696,17 +3680,6 @@ foreach my $file (@files) | ||
| 3696 | $td->NORMALIZE_NEWLINES); | 3680 | $td->NORMALIZE_NEWLINES); |
| 3697 | 3681 | ||
| 3698 | compare_pdfs($file, "a.pdf"); | 3682 | compare_pdfs($file, "a.pdf"); |
| 3699 | - | ||
| 3700 | - if ($have_acroread) | ||
| 3701 | - { | ||
| 3702 | - # These tests require Adobe Reader > 7.x to work with | ||
| 3703 | - # encrypted files. | ||
| 3704 | - $td->runtest("check with Adobe Reader", | ||
| 3705 | - {$td->COMMAND => | ||
| 3706 | - "acroread -toPostScript -pairs a.pdf 1.ps"}, | ||
| 3707 | - {$td->STRING => "", | ||
| 3708 | - $td->EXIT_STATUS => 0}); | ||
| 3709 | - } | ||
| 3710 | } | 3683 | } |
| 3711 | flush_tiff_cache(); | 3684 | flush_tiff_cache(); |
| 3712 | } | 3685 | } |
| @@ -3889,10 +3862,6 @@ $td->report(calc_ntests()); | @@ -3889,10 +3862,6 @@ $td->report(calc_ntests()); | ||
| 3889 | sub calc_ntests | 3862 | sub calc_ntests |
| 3890 | { | 3863 | { |
| 3891 | my $result = $n_tests; | 3864 | my $result = $n_tests; |
| 3892 | - if ($have_acroread) | ||
| 3893 | - { | ||
| 3894 | - $result += $n_acroread; | ||
| 3895 | - } | ||
| 3896 | if ($compare_images) | 3865 | if ($compare_images) |
| 3897 | { | 3866 | { |
| 3898 | $result += 3 * ($n_compare_pdfs); | 3867 | $result += 3 * ($n_compare_pdfs); |