From 8033857295c8c85668cc9deb3375b93d87b85ee9 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 2 Jan 2023 17:54:58 +0100 Subject: [PATCH] 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). (cherry picked from commit e24d3b21d0feeb04e92b41422a6b1ac44e938e63) --- bin/tests/system/testsock.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl index 3677e200b2..e793874d93 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 () { @ids = (1..$1)