Merge branch '2.3' into develop

2019-05-16 10:55:19 +03:00
parent a12a0af887 1c820f6ae3
commit 0a6c94d77b
3 changed files with 49 additions and 1 deletions
--- a/server/core/test/test_buffer.cc
+++ b/server/core/test/test_buffer.cc
@ -589,5 +589,5 @@ int main(int argc, char** argv)

    result += test1();

-    exit(result);
+    return result;
 }