From 86c9b8459471d237521eabb77639c2fadb6f9711 Mon Sep 17 00:00:00 2001
From: Hans Ekkehard Plesser <hans.ekkehard.plesser@nmbu.no>
Date: Wed, 4 Mar 2026 16:39:36 +0100
Subject: [PATCH 1/5] Correctly set pythonpath for tests

---
 testsuite/do_tests.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testsuite/do_tests.sh b/testsuite/do_tests.sh
index 66759754c3..bbbcb55927 100755
--- a/testsuite/do_tests.sh
+++ b/testsuite/do_tests.sh
@@ -106,9 +106,11 @@ if ! ${PYTHON} -c "import junitparser" >/dev/null 2>&1; then
     exit 1
 fi
 
+PYTHON_VERSION="$(python --version | cut -d' ' -f 2)"
+NEST_PY_PATH="${PREFIX}/lib/python${PYTHON_VERSION%.*}/site-packages"
+export PYTHONPATH="${NEST_PY_PATH}${PYTHONPATH:+:$PYTHONPATH}"
+
 # source helpers to set environment variables and make functions available
-NEST_PY_PATH="$(${PYTHON} -c "import sysconfig; print(sysconfig.get_path('platlib'))")"
-PYTHONPATH="${NEST_PY_PATH}${PYTHONPATH:+:$PYTHONPATH}"
 # shellcheck source=testsuite/junit_xml.sh
 . "$(dirname "$0")/junit_xml.sh"
 # shellcheck source=testsuite/run_test.sh

From f70caf661d03a119a2df6b232593980e75fb20cf Mon Sep 17 00:00:00 2001
From: Hans Ekkehard Plesser <hans.ekkehard.plesser@nmbu.no>
Date: Wed, 4 Mar 2026 21:35:29 +0100
Subject: [PATCH 2/5] Set PATH so that cpptests will be found

---
 testsuite/do_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testsuite/do_tests.sh b/testsuite/do_tests.sh
index bbbcb55927..077b5bb782 100755
--- a/testsuite/do_tests.sh
+++ b/testsuite/do_tests.sh
@@ -106,6 +106,8 @@ if ! ${PYTHON} -c "import junitparser" >/dev/null 2>&1; then
     exit 1
 fi
 
+# Set PATH (for cpptests) and PYTHONPATH (for Python tests)
+export PATH="${PREFIX}/bin"
 PYTHON_VERSION="$(python --version | cut -d' ' -f 2)"
 NEST_PY_PATH="${PREFIX}/lib/python${PYTHON_VERSION%.*}/site-packages"
 export PYTHONPATH="${NEST_PY_PATH}${PYTHONPATH:+:$PYTHONPATH}"

From 3a1392f33471f12c6d841ccd3f9a7f414afafafa Mon Sep 17 00:00:00 2001
From: Hans Ekkehard Plesser <hans.ekkehard.plesser@nmbu.no>
Date: Wed, 4 Mar 2026 23:13:38 +0100
Subject: [PATCH 3/5] Add debug output

---
 testsuite/do_tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testsuite/do_tests.sh b/testsuite/do_tests.sh
index 077b5bb782..70ebcf6415 100755
--- a/testsuite/do_tests.sh
+++ b/testsuite/do_tests.sh
@@ -107,7 +107,10 @@ if ! ${PYTHON} -c "import junitparser" >/dev/null 2>&1; then
 fi
 
 # Set PATH (for cpptests) and PYTHONPATH (for Python tests)
-export PATH="${PREFIX}/bin"
+set -x
+export PATH="${PREFIX}/bin${PATH:+:$PATH}"
+echo "PATH: ${PATH}"
+
 PYTHON_VERSION="$(python --version | cut -d' ' -f 2)"
 NEST_PY_PATH="${PREFIX}/lib/python${PYTHON_VERSION%.*}/site-packages"
 export PYTHONPATH="${NEST_PY_PATH}${PYTHONPATH:+:$PYTHONPATH}"

From 46c9c1bde9d9047530e04f5c3c89e1af2dfedb17 Mon Sep 17 00:00:00 2001
From: Hans Ekkehard Plesser <hans.ekkehard.plesser@nmbu.no>
Date: Thu, 5 Mar 2026 07:28:11 +0100
Subject: [PATCH 4/5] Instead of adding prefix/bin to PATH, just add it to name
 of C++-test executable

---
 testsuite/do_tests.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/testsuite/do_tests.sh b/testsuite/do_tests.sh
index 70ebcf6415..50f3439a0f 100755
--- a/testsuite/do_tests.sh
+++ b/testsuite/do_tests.sh
@@ -106,11 +106,7 @@ if ! ${PYTHON} -c "import junitparser" >/dev/null 2>&1; then
     exit 1
 fi
 
-# Set PATH (for cpptests) and PYTHONPATH (for Python tests)
-set -x
-export PATH="${PREFIX}/bin${PATH:+:$PATH}"
-echo "PATH: ${PATH}"
-
+# Set PYTHONPATH
 PYTHON_VERSION="$(python --version | cut -d' ' -f 2)"
 NEST_PY_PATH="${PREFIX}/lib/python${PYTHON_VERSION%.*}/site-packages"
 export PYTHONPATH="${NEST_PY_PATH}${PYTHONPATH:+:$PYTHONPATH}"
@@ -425,9 +421,10 @@ echo
 echo "Phase 8: Running C++ tests (experimental)"
 echo "-----------------------------------------"
 
-if command -v run_all_cpptests >/dev/null 2>&1; then
+CPP_TEST_COMMAND="${PREFIX}/bin/run_all_cpptests"
+if command -v "${CPP_TEST_COMMAND}" >/dev/null 2>&1; then
     set +e
-    CPP_TEST_OUTPUT="$( run_all_cpptests --logger=JUNIT,error,"${REPORTDIR}/08_cpptests.xml":HRF,error,stdout 2>&1 )"
+    CPP_TEST_OUTPUT="$( "${CPP_TEST_COMMAND}" --logger=JUNIT,error,"${REPORTDIR}/08_cpptests.xml":HRF,error,stdout 2>&1 )"
     set -e
     echo "${CPP_TEST_OUTPUT}" | tail -2
 else

From a8f717fda14f6e69a601430f3da83f6cefac2f27 Mon Sep 17 00:00:00 2001
From: Dennis Terhorst <terhorstd@users.noreply.github.com>
Date: Thu, 5 Mar 2026 16:05:09 +0100
Subject: [PATCH 5/5] Apply suggestion from @terhorstd

---
 testsuite/do_tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/do_tests.sh b/testsuite/do_tests.sh
index 50f3439a0f..2489326b5c 100755
--- a/testsuite/do_tests.sh
+++ b/testsuite/do_tests.sh
@@ -107,8 +107,8 @@ if ! ${PYTHON} -c "import junitparser" >/dev/null 2>&1; then
 fi
 
 # Set PYTHONPATH
-PYTHON_VERSION="$(python --version | cut -d' ' -f 2)"
-NEST_PY_PATH="${PREFIX}/lib/python${PYTHON_VERSION%.*}/site-packages"
+PYTHON_VERSION="$(python -c "import sysconfig; print(sysconfig.get_python_version())")"
+NEST_PY_PATH="${PREFIX}/lib/python${PYTHON_VERSION}/site-packages"
 export PYTHONPATH="${NEST_PY_PATH}${PYTHONPATH:+:$PYTHONPATH}"
 
 # source helpers to set environment variables and make functions available