Run qpdf from path rather than environment variable in tests

With cmake, we are customizing the path for each test suite so we can
ensure we get the right qpdf without having to use an environment
variable.

3 files changed, 2 insertions, 7 deletions

diff --git a/examples/qtest/c-objects.test b/examples/qtest/c-objects.test
index 7ca22d00..9cd496f6 100644
--- a/examples/qtest/c-objects.test
+++ b/examples/qtest/c-objects.test
@@ -11,8 +11,6 @@ cleanup();
 
 my $td = new TestDriver('c-objects');
 
-my $qpdf = $ENV{'QPDF_BIN'} or die;
-
 foreach my $i (qw(1 2))
 {
     $td->runtest("c-objects ($i)",
diff --git a/examples/qtest/linearize.test b/examples/qtest/linearize.test
index 711e697b..fde6e944 100644
--- a/examples/qtest/linearize.test
+++ b/examples/qtest/linearize.test
@@ -11,15 +11,13 @@ cleanup();
 
 my $td = new TestDriver('linearize');
 
-my $qpdf = $ENV{'QPDF_BIN'} or die;
-
 $td->runtest("linearize",
              {$td->COMMAND => "pdf-linearize input.pdf '' a.pdf"},
              {$td->REGEXP => '(?s).*input\.pdf progress: \d+\%.*',
                   $td->EXIT_STATUS => 0});
 
 $td->runtest("check",
-             {$td->COMMAND => "$qpdf --check a.pdf"},
+             {$td->COMMAND => "qpdf --check a.pdf"},
              {$td->FILE => "check.out", $td->EXIT_STATUS => 0},
              $td->NORMALIZE_NEWLINES);
 
diff --git a/examples/qtest/mod-info.test b/examples/qtest/mod-info.test
index ec09df9e..f5d1d774 100644
--- a/examples/qtest/mod-info.test
+++ b/examples/qtest/mod-info.test
@@ -11,7 +11,6 @@ require TestDriver;
 my $td = new TestDriver('pdf-mod-info');
 
 my $prg = "pdf-mod-info";
-my $qpdf = $ENV{'QPDF_BIN'} or die;
 
 cleanup();
 
@@ -93,7 +92,7 @@ sub run_and_cmp
                  {$td->STRING => $out,
                   $td->EXIT_STATUS => 0});
     $td->runtest("$dsc output",
-                 {$td->COMMAND => "$qpdf --static-id" .
+                 {$td->COMMAND => "qpdf --static-id" .
                       " --no-original-object-ids -qdf $fout -"},
                  {$td->FILE => $fexp,
                   $td->EXIT_STATUS => 0});