From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 12 Jul 2026 21:38:04 +0000 (+0000)
Subject: Fix support for test-suite/squidconf directive parameter files (#2458)
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=975d82c54eb9d6458eb8a0c968ab8774607d011e;p=thirdparty%2Fsquid.git

Fix support for test-suite/squidconf directive parameter files (#2458)

Those files were never found. 2022 commit d37a3744 probably missed this
bug because the corresponding `squid -k parse` failures (quoted below)
do not result in non-zero exit status code. That failure handling
problem deserves a dedicated fix.

    ERROR: Can not open file empty.conf for reading
        configuration context: ./squidconf/regressions-3.4.0.1.conf(27)
---

diff --git a/test-suite/test-squid-conf.sh b/test-suite/test-squid-conf.sh
index 40d25dc5f1..7d88ea56a0 100755
--- a/test-suite/test-squid-conf.sh
+++ b/test-suite/test-squid-conf.sh
@@ -243,7 +243,11 @@ fi
 
 errorLog="squid-stderr.log"
 
-$sbindir/squid -k parse -f $configFile 2> $errorLog
+# Start `$sbindir/squid` from $configFile's directory, so that Squid can find files included by $configFile.
+# If we decide to support relative `$sbindir` paths, we will add a portable realpath replacement.
+configFileDirName=`dirname $configFile`
+configFileBaseName=`basename $configFile`
+(cd $configFileDirName && $sbindir/squid -k parse -f $configFileBaseName) 2> $errorLog
 result=$?
 
 # this is the value we return to our caller;