Merge branch '2.3' into 2.4

2020-07-02 10:38:54 +03:00
parent 31591dbf00 c9badcb09c
commit 9f07613330
3 changed files with 94 additions and 32 deletions
--- a/maxscale-system-test/maxtest/src/testconnections.cc
+++ b/maxscale-system-test/maxtest/src/testconnections.cc
@ -1035,10 +1035,10 @@ int TestConnections::copy_maxscale_logs(double timestamp)
                                           "rm -rf %s/logs;"
                                           "mkdir %s/logs;"
                                           "cp %s/*.log %s/logs/;"
-                                           "cp /tmp/core* %s/logs/;"
+                                           "test -e /tmp/core* && cp /tmp/core* %s/logs/;"
                                           "cp %s %s/logs/;"
                                           "chmod 777 -R %s/logs;"
-                                           "ls /tmp/core* && exit 42;",
+                                           "test -e /tmp/core* && exit 42;",
                                           maxscales->access_homedir[i],
                                           maxscales->access_homedir[i],
                                           maxscales->maxscale_log_dir[i],