Commit 52b61d67 authored by Dave Gosselin's avatar Dave Gosselin

MDEV-33616 Tests failing on macOS

These tests rely on THR_KEY_mysys but it is not initialized.  On
Linux, the corresponding thread variable is null, but on macOS it has a
nonzero value.  In all cases, initialize the variable explicitly by
calling MY_INIT and my_end appropriately.
parent b331cde2
...@@ -26,8 +26,10 @@ static void check(const char *res) ...@@ -26,8 +26,10 @@ static void check(const char *res)
str1.length= 0; str1.length= 0;
} }
int main(void) int main(int argc, char** argv)
{ {
MY_INIT(argv[0]);
plan(23); plan(23);
IF_WIN(skip_all("Test of POSIX shell escaping rules, not for CMD.EXE\n"), ); IF_WIN(skip_all("Test of POSIX shell escaping rules, not for CMD.EXE\n"), );
...@@ -69,6 +71,7 @@ int main(void) ...@@ -69,6 +71,7 @@ int main(void)
dynstr_free(&str1); dynstr_free(&str1);
my_end(MY_CHECK_ERROR);
return exit_status(); return exit_status();
} }
...@@ -51,6 +51,8 @@ class THD ...@@ -51,6 +51,8 @@ class THD
int main(int args, char **argv) int main(int args, char **argv)
{ {
MY_INIT(argv[0]);
plan(NO_PLAN); plan(NO_PLAN);
diag("Testing Json_writer checks"); diag("Testing Json_writer checks");
...@@ -123,6 +125,7 @@ int main(int args, char **argv) ...@@ -123,6 +125,7 @@ int main(int args, char **argv)
diag("Done"); diag("Done");
my_end(MY_CHECK_ERROR);
return exit_status(); return exit_status();
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment