hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use explicit script path in test_maxctrl

Browse Source 
The path to the script is now explicitly defined. This makes the call
unambiguous as the home directory depends on the current user.
This commit is contained in:
Markus Mäkelä
2017-11-09 14:04:34 +02:00
parent 5acdfab5e6
commit 2792f54089
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxscale-system-test/test_maxctrl.cpp
View File

@ -27,7 +27,8 @@ int main(int argc, char *argv[])
test.tprintf("Starting test"); test.tprintf("Starting test");
test.verbose = true; 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.verbose = false;
test.tprintf("Removing NPM"); test.tprintf("Removing NPM");

2
maxscale-system-test/test_maxctrl.sh
View File

@ -20,7 +20,7 @@ fi
cd MaxScale/maxctrl cd MaxScale/maxctrl
# Create the scripts that start and stop MaxScale # Create the scripts that start and stop MaxScale
~/maxctrl_scripts.sh $maxscale_access_homedir/maxctrl_scripts.sh
chmod +x *.sh chmod +x *.sh
npm i npm i