gen-tests: $testdir/ax -> $testauxdir

* gen-testsuite-part ($testauxdir): New, defined to "$testdir/ax".
Use it throughout, for better encapsulation and less duplication.
($auxdir): Remove as unneeded.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/gen-testsuite-part b/gen-testsuite-part
index b968926..2e79057 100755 (executable)
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -35,8 +35,8 @@ my $srcdir = ".";
 my $testdir = "t";
 
 # Where testsuite-related helper scripts, data files and shell libraries
-# are placed.  Relative to the '$testdir' subdirectory.
-my $auxdir = "ax";
+# are placed.  Relative to the top-lever source directory.
+my $testauxdir = "$testdir/ax";
 
 #--------------------------------------------------------------------------
 
@@ -157,33 +157,33 @@ my %deps_extractor =
     use_trivial_test_driver =>
       {
         line_matcher => qr/\btrivial-test-driver\b/,
-        dist_prereqs => "$testdir/$auxdir/trivial-test-driver",
+        dist_prereqs => "$testauxdir/trivial-test-driver",
       },
     check_testsuite_summary =>
       {
         line_matcher => qr/\btestsuite-summary-checks\.sh\b/,
-        dist_prereqs => "$testdir/$auxdir/testsuite-summary-checks.sh",
+        dist_prereqs => "$testauxdir/testsuite-summary-checks.sh",
       },
     extract_testsuite_summary =>
       {
         line_matcher => qr/\bextract-testsuite-summary\.pl\b/,
-        dist_prereqs => "$testdir/$auxdir/extract-testsuite-summary.pl",
+        dist_prereqs => "$testauxdir/extract-testsuite-summary.pl",
       },
     check_tap_testsuite_summary =>
       {
         line_matcher => qr/\btap-summary-aux\.sh\b/,
-        dist_prereqs => "$testdir/$auxdir/tap-summary-aux.sh",
+        dist_prereqs => "$testauxdir/tap-summary-aux.sh",
       },
     on_tap_with_common_setup =>
       {
         line_matcher => qr/\btap-setup\.sh\b/,
-        dist_prereqs => "$testdir/$auxdir/tap-setup.sh",
+        dist_prereqs => "$testauxdir/tap-setup.sh",
         nodist_prereqs => "$testdir/tap-common-setup.log",
       },
     depcomp =>
       {
         line_matcher => qr/\bdepcomp\.sh\b/,
-        dist_prereqs => "$testdir/$auxdir/depcomp.sh",
+        dist_prereqs => "$testauxdir/depcomp.sh",
       },
   );