From: Samuli Seppänen <samuli@openvpn.net>
Date: Tue, 8 Nov 2016 12:55:26 +0000 (+0200)
Subject: Fix update_t_client_ips.sh for out of tree builds
X-Git-Tag: v2.4_beta1~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2af1fa8b19e9723b29f4a4c198f61478ae9e688e;p=thirdparty%2Fopenvpn.git

Fix update_t_client_ips.sh for out of tree builds

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1478609729-25222-2-git-send-email-samuli@openvpn.net>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg12952.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/tests/t_client.rc-sample b/tests/t_client.rc-sample
index 59f34c7f2..31dfafac0 100644
--- a/tests/t_client.rc-sample
+++ b/tests/t_client.rc-sample
@@ -13,8 +13,8 @@ CLIENT_KEY="${top_srcdir}/sample/sample-keys/client.key"
 CLIENT_CERT="${top_srcdir}/sample/sample-keys/client.crt"
 
 # Load EXPECT_IFCONFIG* parameters from cache
-if [ -r "${top_srcdir}/t_client_ips.rc" ]; then
-    . "${top_srcdir}/t_client_ips.rc"
+if [ -r "${top_builddir}/t_client_ips.rc" ]; then
+    . "${top_builddir}/t_client_ips.rc"
 else
     echo "NOTICE: missing t_client_ips.rc will be auto-generated"
 fi
diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index 6c81bc412..408703ee5 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -275,7 +275,7 @@ do
     # If EXCEPT_IFCONFIG* variables for this test are missing, run an --up
     # script to generate them dynamically.
     if [ -z "$expect_ifconfig4" ] || [ -z "$expect_ifconfig6" ]; then
-        up="--setenv TESTNUM $SUF --setenv TOP_BUILDDIR ${top_builddir} --script-security 2 --up ${top_builddir}/tests/update_t_client_ips.sh"
+        up="--setenv TESTNUM $SUF --setenv TOP_BUILDDIR ${top_builddir} --script-security 2 --up ${srcdir}/update_t_client_ips.sh"
     fi
 
     echo -e "\n### test run $SUF: '$test_run_title' ###\n"