mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 03:52:28 +02:00
Code

Fix update_t_client_ips.sh for out of tree builds

Browse Source 
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>
This commit is contained in:
Samuli Seppänen 2016-11-08 14:55:26 +02:00 committed by Gert Doering
parent 9c3a9335ee
commit 2af1fa8b19
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/t_client.rc-sample
View File

@ -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

2
tests/t_client.sh.in
View File

@ -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"