Merge branch '2.2' into 2.3

2019-03-05 04:54:40 +02:00
parent 42b3f970c5 8a0b6005a4
commit 77ef3dd613
25 changed files with 600 additions and 146 deletions
--- a/maxscale-system-test/script.cpp
+++ b/maxscale-system-test/script.cpp
@ -206,7 +206,7 @@ int main(int argc, char* argv[])
            Test->maxscales->access_user[0],
            Test->maxscales->IP[0],
            Test->maxscales->access_homedir[0]);
-    system(str);
+    Test->add_result(system(str), "Error copying script to VM");

    sprintf(str, "%s/script_output_expected", Test->maxscales->access_homedir[0]);
    test_script_monitor(Test, Test->repl, str);