Commit 7fd63cac authored by Marc Alff's avatar Marc Alff

Bug#11830755 - UNIT TESTS PFS_INSTR AND PFS_INSTR_CLASS CRASH IN MUTEX CALLS ON WINDOWS

Before this fix, two performance schema unit tests crashed on windows.

The problem was a missing initialization to PFS_atomics,
which caused the crash only for platform not compiled with native atomics.

This fix adds the missing initialization in the unit tests.
No production code was changed, this is a unit test bug only.
parent 739b073e
...@@ -1205,6 +1205,8 @@ void test_enabled() ...@@ -1205,6 +1205,8 @@ void test_enabled()
void do_all_tests() void do_all_tests()
{ {
/* Using initialize_performance_schema(), no partial init needed. */
test_bootstrap(); test_bootstrap();
test_bad_registration(); test_bad_registration();
test_init_disabled(); test_init_disabled();
......
...@@ -199,7 +199,11 @@ void test_oom() ...@@ -199,7 +199,11 @@ void test_oom()
void do_all_tests() void do_all_tests()
{ {
PFS_atomic::init();
test_oom(); test_oom();
PFS_atomic::cleanup();
} }
int main(int, char **) int main(int, char **)
......
...@@ -400,10 +400,14 @@ void test_per_thread_wait() ...@@ -400,10 +400,14 @@ void test_per_thread_wait()
void do_all_tests() void do_all_tests()
{ {
PFS_atomic::init();
test_no_instruments(); test_no_instruments();
test_no_instances(); test_no_instances();
test_with_instances(); test_with_instances();
test_per_thread_wait(); test_per_thread_wait();
PFS_atomic::cleanup();
} }
int main(int, char **) int main(int, char **)
......
...@@ -47,7 +47,11 @@ void test_oom() ...@@ -47,7 +47,11 @@ void test_oom()
void do_all_tests() void do_all_tests()
{ {
PFS_atomic::init();
test_oom(); test_oom();
PFS_atomic::cleanup();
} }
int main(int, char **) int main(int, char **)
......
...@@ -554,6 +554,8 @@ void test_instruments_reset() ...@@ -554,6 +554,8 @@ void test_instruments_reset()
void do_all_tests() void do_all_tests()
{ {
PFS_atomic::init();
test_no_registration(); test_no_registration();
test_mutex_registration(); test_mutex_registration();
test_rwlock_registration(); test_rwlock_registration();
...@@ -562,6 +564,8 @@ void do_all_tests() ...@@ -562,6 +564,8 @@ void do_all_tests()
test_file_registration(); test_file_registration();
test_table_registration(); test_table_registration();
test_instruments_reset(); test_instruments_reset();
PFS_atomic::cleanup();
} }
int main(int, char **) int main(int, char **)
......
...@@ -105,7 +105,11 @@ void test_timers() ...@@ -105,7 +105,11 @@ void test_timers()
void do_all_tests() void do_all_tests()
{ {
PFS_atomic::init();
test_timers(); test_timers();
PFS_atomic::cleanup();
} }
int main(int, char **) int main(int, char **)
......
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