Merge branch '2.2' into 2.3

2019-03-15 12:26:59 +02:00
parent 29b8d12be3 4697128b3c
commit 14890cb232
8 changed files with 71 additions and 39 deletions
--- a/maxscale-system-test/fwf_syntax.cpp
+++ b/maxscale-system-test/fwf_syntax.cpp
@ -64,7 +64,7 @@ int main(int argc, char** argv)
    for (int i = 0; rules_failure[i]; i++)
    {
        /** Create rule file with syntax error */
-        test.add_result(truncate(temp_rules, 0), "Failed to truncate");
+        int __attribute__((unused)) rc = truncate(temp_rules, 0);
        create_rule(rules_failure[i], users_ok[0]);
        char buf[PATH_MAX + 1];
        copy_rules(&test, (char*)temp_rules, (char*)getcwd(buf, sizeof(buf)));