From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 2 Jan 2023 16:54:58 +0000 (+0100)
Subject: Look for ifconfig.sh.in in testsock.pl parent dir
X-Git-Tag: v9.19.10~44^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e24d3b21d0feeb04e92b41422a6b1ac44e938e63;p=thirdparty%2Fbind9.git

Look for ifconfig.sh.in in testsock.pl parent dir

Instead of using the current working directory to find the ifconfig.sh
script, look for the ifconfig.sh.in template in the directory where the
testsock.pl script is located. This enables the testsock.pl script to be
called from any working directory.

Using the ifconfig.sh.in template is sufficient, since it contains
the necessary information to be extracted: the max= value (which is
hard-coded in the template).
---

diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index 3677e200b26..e793874d93b 100755
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -15,6 +15,8 @@
 
 require 5.001;
 
+use Cwd 'abs_path';
+use File::Basename;
 use Socket;
 use Getopt::Long;
 
@@ -27,7 +29,8 @@ my @ids;
 if ($id != 0) {
 	@ids = ($id);
 } else {
-	my $fn = "ifconfig.sh";
+	my $dir = dirname(abs_path($0));
+	my $fn = "$dir/ifconfig.sh.in";
 	open FH, "< $fn" or die "open < $fn: $!\n";
 	while (<FH>) {
 		@ids = (1..$1)