1. openvpn
  2. Commit 2af1fa8b19e9723b29f4a4c198f61478ae9e688e
Browse code

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>

Samuli Seppänen authored on 2016/11/08 21:55:26
Showing 2 changed files
tests/t_client.rc-sample
History View file @ 2af1fa8
... ... 
@@ -13,8 +13,8 @@ CLIENT_KEY="${top_srcdir}/sample/sample-keys/client.key"
13 13 
 CLIENT_CERT="${top_srcdir}/sample/sample-keys/client.crt"
14 14
15 15 
 # Load EXPECT_IFCONFIG* parameters from cache
16 
-if [ -r "${top_srcdir}/t_client_ips.rc" ]; then
17 
-    . "${top_srcdir}/t_client_ips.rc"
16 
+if [ -r "${top_builddir}/t_client_ips.rc" ]; then
17 
+    . "${top_builddir}/t_client_ips.rc"
18 18 
 else
19 19 
     echo "NOTICE: missing t_client_ips.rc will be auto-generated"
20 20 
 fi
tests/t_client.sh.in
History View file @ 2af1fa8
... ... 
@@ -275,7 +275,7 @@ do
275 275 
     # If EXCEPT_IFCONFIG* variables for this test are missing, run an --up
276 276 
     # script to generate them dynamically.
277 277 
     if [ -z "$expect_ifconfig4" ] || [ -z "$expect_ifconfig6" ]; then
278 
-        up="--setenv TESTNUM $SUF --setenv TOP_BUILDDIR ${top_builddir} --script-security 2 --up ${top_builddir}/tests/update_t_client_ips.sh"
278 
+        up="--setenv TESTNUM $SUF --setenv TOP_BUILDDIR ${top_builddir} --script-security 2 --up ${srcdir}/update_t_client_ips.sh"
279 279 
     fi
280 280
281 281 
     echo -e "\n### test run $SUF: '$test_run_title' ###\n"