From 4782b5904f2cddc7ecda86abc0590a2ff8715b33 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 30 Dec 2021 12:56:27 -0500
Subject: [PATCH] Move filter-completion.pl to libtests/arg_parser

---
 .../qpdf => libtests/qtest/arg_parser}/filter-completion.pl | 2 ++
 qpdf/qtest/qpdf.test                                        | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename {qpdf/qtest/qpdf => libtests/qtest/arg_parser}/filter-completion.pl (93%)

diff --git a/qpdf/qtest/qpdf/filter-completion.pl b/libtests/qtest/arg_parser/filter-completion.pl
similarity index 93%
rename from qpdf/qtest/qpdf/filter-completion.pl
rename to libtests/qtest/arg_parser/filter-completion.pl
index a81178e2..2d176309 100644
--- a/qpdf/qtest/qpdf/filter-completion.pl
+++ b/libtests/qtest/arg_parser/filter-completion.pl
@@ -1,6 +1,8 @@
 use warnings;
 use strict;
 
+# THIS SCRIPT IS ALSO USED IN qpdf.test
+
 # Output every line from STDIN that appears in the file.
 my %wanted = ();
 my %notwanted = ();
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index cd401216..d12c9492 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -115,6 +115,8 @@ my @completion_tests = (
     ['qpdf --encrypt user\ password ', undef, 'quoting'],
     );
 $n_tests += 2 * scalar(@completion_tests);
+my $completion_filter =
+    "perl ../../../libtests/qtest/arg_parser/filter-completion.pl";
 foreach my $c (@completion_tests)
 {
     my ($cmd, $point, $description) = @$c;
@@ -126,12 +128,12 @@ foreach my $c (@completion_tests)
     }
     $td->runtest("bash completion: $description",
                  {$td->COMMAND => [@{bash_completion($cmd, $point)}],
-                      $td->FILTER => "perl filter-completion.pl $out"},
+                      $td->FILTER => "$completion_filter $out"},
                  {$td->FILE => "$out", $td->EXIT_STATUS => 0},
                  $td->NORMALIZE_NEWLINES);
     $td->runtest("zsh completion: $description",
                  {$td->COMMAND => [@{zsh_completion($cmd, $point)}],
-                      $td->FILTER => "perl filter-completion.pl $zout"},
+                      $td->FILTER => "$completion_filter $zout"},
                  {$td->FILE => "$zout", $td->EXIT_STATUS => 0},
                  $td->NORMALIZE_NEWLINES);
 }