From 3ee4a897390797fb793df136612a8285ee60a0d9 Mon Sep 17 00:00:00 2001
From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Mon, 10 Jun 2024 14:43:38 +0200
Subject: [PATCH] Rename PDNS_MESON_PATH to PDNS_BUILD_PATH

This also ensures that PDNS_BUILD_PATH is set to `.` when the user does not pass it. This
stays consistent with the behavior we previously had.
---
 .github/workflows/build-and-test-all.yml      |  2 +-
 regression-tests/backends/bind-master         |  4 +--
 regression-tests/backends/geoip-master        |  2 +-
 regression-tests/backends/gmysql-master       |  2 +-
 regression-tests/backends/godbc_mssql-master  |  2 +-
 .../backends/godbc_sqlite3-master             |  2 +-
 regression-tests/backends/gpgsql-master       |  2 +-
 regression-tests/backends/gsqlite3-master     |  2 +-
 regression-tests/backends/ldap-master         |  2 +-
 regression-tests/backends/lmdb-master         |  2 +-
 regression-tests/backends/lua2-master         |  2 +-
 regression-tests/backends/remote-master       |  4 +--
 regression-tests/backends/tinydns-master      |  2 +-
 regression-tests/runtests                     | 31 ++++++++++---------
 regression-tests/start-test-stop              | 31 ++++++++++---------
 15 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 6a3f928a63..ad12ae87d9 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -108,7 +108,7 @@ jobs:
         run: inv install-auth-test-deps-only -b geoip
       - run: inv ci-auth-run-unit-tests ${{ matrix.build_option }}
         env:
-          PDNS_MESON_PATH: ../pdns-${{ env.BUILDER_VERSION }}
+          PDNS_BUILD_PATH: ../pdns-${{ env.BUILDER_VERSION }}
       - run: inv generate-coverage-info ./testrunner $GITHUB_WORKSPACE
         if: ${{ env.COVERAGE == 'yes' && matrix.builder != 'meson' }}
         working-directory: ./pdns-${{ env.BUILDER_VERSION }}/pdns
diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index 2e89eb6739..b91b83fc56 100644
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -1,7 +1,7 @@
 case $context in
     bind)
         cat > pdns-bind.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=bind
 bind-config=./named.conf
 bind-ignore-broken-records=yes
@@ -18,7 +18,7 @@ __EOF__
     bind-dnssec | bind-dnssec-nsec3 | bind-hybrid-nsec3 | bind-dnssec-nsec3-optout | bind-dnssec-nsec3-narrow)
         rm -f dnssec.sqlite3
         cat > pdns-bind.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=bind
 bind-config=./named.conf
 bind-ignore-broken-records=yes
diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index ad05c1dd25..c3e3ef1757 100644
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -137,7 +137,7 @@ EOF
 			--cache-ttl=$cachettl --dname-processing --no-config \
 			--distributor-threads=1 \
                         --geoip-zones-file=$testsdir/geo.yaml --geoip-database-files="$geoipdatabase" \
-                        --module-dir="$PDNS_MESON_PATH/./modules" --edns-subnet-processing=yes \
+                        --module-dir="$PDNS_BUILD_PATH/modules" --edns-subnet-processing=yes \
 			$geoipkeydir &
 		;;
 
diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index 222795aa52..e90f95e152 100644
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -17,7 +17,7 @@ case $context in
 			"$GMYSQLDB"
 
 		cat > pdns-gmysql.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=gmysql
 gmysql-dbname=$GMYSQLDB
 gmysql-user=$GMYSQLUSER
diff --git a/regression-tests/backends/godbc_mssql-master b/regression-tests/backends/godbc_mssql-master
index 75d87e7ce9..739fad50c1 100644
--- a/regression-tests/backends/godbc_mssql-master
+++ b/regression-tests/backends/godbc_mssql-master
@@ -17,7 +17,7 @@ case $context in
 		# actually terminates
 		tosql gsqlite | grep -v -E '(COMMIT|TRANSACTION)' | awk '1;!(NR%98){print "go"}' | cat - <(echo go) /dev/null | $BSQLODBC
 		cat > pdns-godbc_mssql.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=godbc
 godbc-datasource=$GODBC_MSSQL_DSN
 godbc-username=$GODBC_MSSQL_USERNAME
diff --git a/regression-tests/backends/godbc_sqlite3-master b/regression-tests/backends/godbc_sqlite3-master
index dce76695a8..fe3e94e122 100644
--- a/regression-tests/backends/godbc_sqlite3-master
+++ b/regression-tests/backends/godbc_sqlite3-master
@@ -7,7 +7,7 @@ case $context in
 		echo 'ANALYZE; PRAGMA journal_mode=WAL;' | sqlite3 pdns.sqlite3
 
 		cat > pdns-godbc_sqlite3.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=godbc
 godbc-datasource=$GODBC_SQLITE3_DSN
 
diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 3d252e9d96..9741599c21 100644
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -12,7 +12,7 @@ case $context in
                 psql --user="$GPGSQLUSER" -c "ANALYZE" "$GPGSQLDB"
 
 		cat > pdns-gpgsql.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=gpgsql
 gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER
diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master
index 2eb433fcce..4f3b532e13 100644
--- a/regression-tests/backends/gsqlite3-master
+++ b/regression-tests/backends/gsqlite3-master
@@ -8,7 +8,7 @@ case $context in
 		echo ANALYZE\; | sqlite3 pdns.sqlite3
 
 		cat > pdns-gsqlite3.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=gsqlite3
 gsqlite3-database=pdns.sqlite3
 consistent-backends
diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index 9f53b4fb0f..cbb0d62c91 100644
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -17,7 +17,7 @@ __EOF__
 		$ZONE2LDAP --dnsttl=yes --basedn=$LDAPBASEDN --layout=$layout --named-conf=named.conf | ldapmodify -D $LDAPUSER -w $LDAPPASSWD -H $LDAPHOST -c > /dev/null || true
 
 		cat > pdns-ldap.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=ldap
 ldap-basedn=$LDAPBASEDN
 ldap-binddn=$LDAPUSER
diff --git a/regression-tests/backends/lmdb-master b/regression-tests/backends/lmdb-master
index 7703b61016..2866570dbc 100644
--- a/regression-tests/backends/lmdb-master
+++ b/regression-tests/backends/lmdb-master
@@ -1,7 +1,7 @@
 case $context in
     lmdb | lmdb-nodnssec | lmdb-nsec3 | lmdb-nsec3-optout | lmdb-nsec3-narrow)
         cat > pdns-lmdb.conf << __EOF__
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=lmdb
 lmdb-filename=./pdns.lmdb
 lmdb-random-ids=yes
diff --git a/regression-tests/backends/lua2-master b/regression-tests/backends/lua2-master
index 4dd1ca63f4..f636250eb1 100644
--- a/regression-tests/backends/lua2-master
+++ b/regression-tests/backends/lua2-master
@@ -23,7 +23,7 @@ case $context in
 
 		# generate pdns.conf for pdnsutil
 		cat > pdns-lua2.conf <<EOF
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=lua2
 lua2-filename=$testsdir/$luascript
 lua2-api=2
diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 8530eb7b5c..7abb1b4502 100644
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -90,7 +90,7 @@ case $context in
 
 		# generate pdns.conf for pdnsutil
 		cat > pdns-remote.conf <<EOF
-module-dir=$PDNS_MESON_PATH/./modules
+module-dir=$PDNS_BUILD_PATH/modules
 launch=remote
 remote-connection-string=$connstr,timeout=10000
 EOF
@@ -123,7 +123,7 @@ EOF
 			--cache-ttl=$cachettl --dname-processing --no-config \
 			--distributor-threads=1 \
 			--dnsupdate=yes --zone-cache-refresh-interval=0 \
-			--remote-connection-string="$connstr" $remote_add_param --module-dir="$PDNS_MESON_PATH/./modules" &
+			--remote-connection-string="$connstr" $remote_add_param --module-dir="$PDNS_BUILD_PATH/modules" &
 		;;
 
 	*)
diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master
index f3a5975778..dd35a3dce5 100644
--- a/regression-tests/backends/tinydns-master
+++ b/regression-tests/backends/tinydns-master
@@ -4,7 +4,7 @@ case $context in
 			--no-shuffle --launch=tinydns \
 		 --cache-ttl=$cachettl --dname-processing --no-config \
 			--dnsupdate=yes \
-			--tinydns-dbfile=../modules/tinydnsbackend/data.cdb --module-dir="$PDNS_MESON_PATH/./modules" &
+			--tinydns-dbfile=../modules/tinydnsbackend/data.cdb --module-dir="$PDNS_BUILD_PATH/modules" &
 		skipreasons="nodnssec noent nodyndns nometa noaxfr noalias"
 		;;
 
diff --git a/regression-tests/runtests b/regression-tests/runtests
index 63bf592207..d1ced13730 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -7,8 +7,9 @@ fi
 PATH=.:$PATH:/usr/sbin
 MAKE=${MAKE:-make}
 
-if [ -z "$PDNS_MESON_PATH" ]; then
-  # PDNS_MESON_PATH is unset or empty. Assume an autotools build.
+if [ -z "$PDNS_BUILD_PATH" ]; then
+  # PDNS_BUILD_PATH is unset or empty. Assume an autotools build.
+  PDNS_BUILD_PATH=.
 
   export PDNS=${PDNS:-${PWD}/../pdns/pdns_server}
   export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}
@@ -24,19 +25,19 @@ if [ -z "$PDNS_MESON_PATH" ]; then
   export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
   export PDNSCONTROL=${PDNSCONTROL:-${PWD}/../pdns/pdns_control}
 else
-  export PDNS=${PDNS:-$PDNS_MESON_PATH/pdns-auth}
-  export PDNS2=${PDNS2:-$PDNS_MESON_PATH/pdns-auth}
-  export PDNSRECURSOR=${PDNSRECURSOR:-$PDNS_MESON_PATH/pdns/recursordist/pdns_recursor}
-  export RECCONTROL=${RECCONTROL:-$PDNS_MESON_PATH/pdns/recursordist/rec_control}
-  export SDIG=${SDIG:-$PDNS_MESON_PATH/sdig}
-  export NOTIFY=${NOTIFY:-$PDNS_MESON_PATH/pdns-auth-notify}
-  export NSEC3DIG=${NSEC3DIG:-$PDNS_MESON_PATH/nsec3dig}
-  export SAXFR=${SAXFR:-$PDNS_MESON_PATH/saxfr}
-  export ZONE2SQL=${ZONE2SQL:-$PDNS_MESON_PATH/pdns-zone2sql}
-  export ZONE2JSON=${ZONE2JSON:-$PDNS_MESON_PATH/pdns-zone2json}
-  export ZONE2LDAP=${ZONE2LDAP:-$PDNS_MESON_PATH/pdns-zone2ldap}
-  export PDNSUTIL=${PDNSUTIL:-$PDNS_MESON_PATH/pdns-auth-util}
-  export PDNSCONTROL=${PDNSCONTROL:-$PDNS_MESON_PATH/pdns-auth-control}
+  export PDNS=${PDNS:-$PDNS_BUILD_PATH/pdns-auth}
+  export PDNS2=${PDNS2:-$PDNS_BUILD_PATH/pdns-auth}
+  export PDNSRECURSOR=${PDNSRECURSOR:-$PDNS_BUILD_PATH/pdns/recursordist/pdns_recursor}
+  export RECCONTROL=${RECCONTROL:-$PDNS_BUILD_PATH/pdns/recursordist/rec_control}
+  export SDIG=${SDIG:-$PDNS_BUILD_PATH/sdig}
+  export NOTIFY=${NOTIFY:-$PDNS_BUILD_PATH/pdns-auth-notify}
+  export NSEC3DIG=${NSEC3DIG:-$PDNS_BUILD_PATH/nsec3dig}
+  export SAXFR=${SAXFR:-$PDNS_BUILD_PATH/saxfr}
+  export ZONE2SQL=${ZONE2SQL:-$PDNS_BUILD_PATH/pdns-zone2sql}
+  export ZONE2JSON=${ZONE2JSON:-$PDNS_BUILD_PATH/pdns-zone2json}
+  export ZONE2LDAP=${ZONE2LDAP:-$PDNS_BUILD_PATH/pdns-zone2ldap}
+  export PDNSUTIL=${PDNSUTIL:-$PDNS_BUILD_PATH/pdns-auth-util}
+  export PDNSCONTROL=${PDNSCONTROL:-$PDNS_BUILD_PATH/pdns-auth-control}
 fi
 
 unset _JAVA_OPTIONS
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index d032b72558..97c84c2cb3 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -4,8 +4,9 @@ if [ "${PDNS_DEBUG}" = "YES" ]; then
   set -x
 fi
 
-if [ -z "$PDNS_MESON_PATH" ]; then
-  # PDNS_MESON_PATH is unset or empty. Assume an autotools build.
+if [ -z "$PDNS_BUILD_PATH" ]; then
+  # PDNS_BUILD_PATH is unset or empty. Assume an autotools build.
+  PDNS_BUILD_PATH=.
 
   export PDNS=${PDNS:-${PWD}/../pdns/pdns_server}
   export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}
@@ -21,19 +22,19 @@ if [ -z "$PDNS_MESON_PATH" ]; then
   export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
   export PDNSCONTROL=${PDNSCONTROL:-${PWD}/../pdns/pdns_control}
 else
-  export PDNS=${PDNS:-$PDNS_MESON_PATH/pdns-auth}
-  export PDNS2=${PDNS2:-$PDNS_MESON_PATH/pdns-auth}
-  export PDNSRECURSOR=${PDNSRECURSOR:-$PDNS_MESON_PATH/pdns/recursordist/pdns_recursor}
-  export RECCONTROL=${RECCONTROL:-$PDNS_MESON_PATH/pdns/recursordist/rec_control}
-  export SDIG=${SDIG:-$PDNS_MESON_PATH/sdig}
-  export NOTIFY=${NOTIFY:-$PDNS_MESON_PATH/pdns-auth-notify}
-  export NSEC3DIG=${NSEC3DIG:-$PDNS_MESON_PATH/nsec3dig}
-  export SAXFR=${SAXFR:-$PDNS_MESON_PATH/saxfr}
-  export ZONE2SQL=${ZONE2SQL:-$PDNS_MESON_PATH/pdns-zone2sql}
-  export ZONE2JSON=${ZONE2JSON:-$PDNS_MESON_PATH/pdns-zone2json}
-  export ZONE2LDAP=${ZONE2LDAP:-$PDNS_MESON_PATH/pdns-zone2ldap}
-  export PDNSUTIL=${PDNSUTIL:-$PDNS_MESON_PATH/pdns-auth-util}
-  export PDNSCONTROL=${PDNSCONTROL:-$PDNS_MESON_PATH/pdns-auth-control}
+  export PDNS=${PDNS:-$PDNS_BUILD_PATH/pdns-auth}
+  export PDNS2=${PDNS2:-$PDNS_BUILD_PATH/pdns-auth}
+  export PDNSRECURSOR=${PDNSRECURSOR:-$PDNS_BUILD_PATH/pdns/recursordist/pdns_recursor}
+  export RECCONTROL=${RECCONTROL:-$PDNS_BUILD_PATH/pdns/recursordist/rec_control}
+  export SDIG=${SDIG:-$PDNS_BUILD_PATH/sdig}
+  export NOTIFY=${NOTIFY:-$PDNS_BUILD_PATH/pdns-auth-notify}
+  export NSEC3DIG=${NSEC3DIG:-$PDNS_BUILD_PATH/nsec3dig}
+  export SAXFR=${SAXFR:-$PDNS_BUILD_PATH/saxfr}
+  export ZONE2SQL=${ZONE2SQL:-$PDNS_BUILD_PATH/pdns-zone2sql}
+  export ZONE2JSON=${ZONE2JSON:-$PDNS_BUILD_PATH/pdns-zone2json}
+  export ZONE2LDAP=${ZONE2LDAP:-$PDNS_BUILD_PATH/pdns-zone2ldap}
+  export PDNSUTIL=${PDNSUTIL:-$PDNS_BUILD_PATH/pdns-auth-util}
+  export PDNSCONTROL=${PDNSCONTROL:-$PDNS_BUILD_PATH/pdns-auth-control}
 fi
 
 export RESOLVERIP=${RESOLVERIP:-8.8.8.8}
-- 
2.47.2