From 2792f54089a7fdea2b65f63b43964bade0f7e4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 9 Nov 2017 14:04:34 +0200 Subject: [PATCH] Use explicit script path in test_maxctrl The path to the script is now explicitly defined. This makes the call unambiguous as the home directory depends on the current user. --- maxscale-system-test/test_maxctrl.cpp | 3 ++- maxscale-system-test/test_maxctrl.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/maxscale-system-test/test_maxctrl.cpp b/maxscale-system-test/test_maxctrl.cpp index 0227d383c..99384ed2d 100644 --- a/maxscale-system-test/test_maxctrl.cpp +++ b/maxscale-system-test/test_maxctrl.cpp @@ -27,7 +27,8 @@ int main(int argc, char *argv[]) test.tprintf("Starting test"); test.verbose = true; - int rv = test.ssh_maxscale(true, "export maxscale2_API=%s:8989; ./test_maxctrl.sh", test.galera->IP[3]); + int rv = test.ssh_maxscale(true, "export maxscale_access_homedir=%s; export maxscale2_API=%s:8989; ./test_maxctrl.sh", + test.maxscale_access_homedir, test.galera->IP[3]); test.verbose = false; test.tprintf("Removing NPM"); diff --git a/maxscale-system-test/test_maxctrl.sh b/maxscale-system-test/test_maxctrl.sh index 0f5ce0b07..f83bd87e5 100755 --- a/maxscale-system-test/test_maxctrl.sh +++ b/maxscale-system-test/test_maxctrl.sh @@ -20,7 +20,7 @@ fi cd MaxScale/maxctrl # Create the scripts that start and stop MaxScale -~/maxctrl_scripts.sh +$maxscale_access_homedir/maxctrl_scripts.sh chmod +x *.sh npm i