aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2019-01-31 14:39:05 +0100
committerJay Berkenbilt <ejb@ql.org>2019-01-31 16:38:13 +0100
commit22bcdbe786b5398d09fadae5c147359b9162293b (patch)
tree835991ecf742f63b8bf868d131608d28e44bf94e
parent1eb35a355f12f2edf69868b749f58c08ef58f1c6 (diff)
downloadqpdf-22bcdbe786b5398d09fadae5c147359b9162293b.tar.zst
Remove acroread from tests
This hasn't worked or been exercised in years since Adobe stopped releasing a Linux version of reader.
-rw-r--r--ChangeLog5
-rw-r--r--ispell-words1
-rw-r--r--manual/qpdf-manual.xml9
-rw-r--r--qpdf/qtest/qpdf.test35
4 files changed, 7 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index 1481fa46..19a726e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-31 Jay Berkenbilt <ejb@ql.org>
+
+ * Remove traces of acroread, which hasn't been available in Linux
+ for a long time.
+
2019-01-30 Jay Berkenbilt <ejb@ql.org>
* Do not include space after ID operator in inline image data. The
diff --git a/ispell-words b/ispell-words
index fdaafb69..74e4340b 100644
--- a/ispell-words
+++ b/ispell-words
@@ -19,7 +19,6 @@ accessor
aclocal
AcroForm
acroform
-acroread
activatePipelineStack
ActiveState
acyclic
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index a724ba54..605e1a5d 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -196,15 +196,6 @@
ghostscript.
</para>
<para>
- If Adobe Reader is installed as <command>acroread</command>, some
- additional test cases will be enabled. These test cases simply
- verify that Adobe Reader can open the files that qpdf creates.
- They require version 8.0 or newer to pass. However, in order to
- avoid having qpdf depend on non-free (as in liberty) software, the
- test suite will still pass without Adobe reader, and the test
- suite still exercises the full functionality of the software.
- </para>
- <para>
Pre-built documentation is distributed with qpdf, so you should
generally not need to rebuild the documentation. In order to
build the documentation from its docbook sources, you need the
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index da40d389..cb1d6727 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -30,18 +30,6 @@ if (defined($large_file_test_path))
$large_file_test_path =~ s!\\!/!g;
}
-my $have_acroread = 0;
-
-if ($compare_images)
-{
- # check for working acroread
- if (system("acroread -toPostScript -pairs good1.pdf a.ps" .
- " >$devNull 2>&1") == 0)
- {
- $have_acroread = 1;
- }
-}
-
# These variables are used to store the total number of tests in the
# test suite. NOTE: qtest's requirement to indicate the number of
# tests serves as a check that the test suite is operating properly.
@@ -56,12 +44,9 @@ if ($compare_images)
# compare_pdfs generates depends on the value of $compare_images.
my $n_compare_pdfs = 0;
-# This should be set to the number of times we call acroread.
-my $n_acroread = 0;
-
# Each section of tests should increment this number by the number of
-# tests they generate excluding calls to acroread or compare_pdfs,
-# which are tracked separately by $n_compare_pdfs and $n_acroread.
+# tests they generate excluding calls to compare_pdfs, which are
+# tracked separately by $n_compare_pdfs.
my $n_tests = 0;
# Call show_ntests after each block of test cases. In show_ntests,
@@ -3634,7 +3619,6 @@ my @flags = (["-qdf", # 1
$n_tests += 1 + (@files * @flags * 2 * 3);
$n_compare_pdfs += 1 + (@files * @flags * 2);
-$n_acroread += (@files * @flags * 2);
foreach my $file (@files)
{
@@ -3696,17 +3680,6 @@ foreach my $file (@files)
$td->NORMALIZE_NEWLINES);
compare_pdfs($file, "a.pdf");
-
- if ($have_acroread)
- {
- # These tests require Adobe Reader > 7.x to work with
- # encrypted files.
- $td->runtest("check with Adobe Reader",
- {$td->COMMAND =>
- "acroread -toPostScript -pairs a.pdf 1.ps"},
- {$td->STRING => "",
- $td->EXIT_STATUS => 0});
- }
}
flush_tiff_cache();
}
@@ -3889,10 +3862,6 @@ $td->report(calc_ntests());
sub calc_ntests
{
my $result = $n_tests;
- if ($have_acroread)
- {
- $result += $n_acroread;
- }
if ($compare_images)
{
$result += 3 * ($n_compare_pdfs);