Merge branch '2.3' into develop

2019-03-05 10:37:56 +02:00
parent 83fc3b1bc2 6332f0876b
commit 9572ff84ea
32 changed files with 948 additions and 134 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);