Commit 81ee5b4b1785ff2d06b15d11ceeb00bb79c47f65
1 parent
9e1680fa
Do not copy tests (they are cloned)
Showing
1 changed file
with
4 additions
and
4 deletions
src/test/GTestSuite.cpp
| @@ -844,8 +844,8 @@ void GTestSuite::init_members(void) | @@ -844,8 +844,8 @@ void GTestSuite::init_members(void) | ||
| 844 | { | 844 | { |
| 845 | // Initialise members | 845 | // Initialise members |
| 846 | m_name = "Unnamed Test Suite"; | 846 | m_name = "Unnamed Test Suite"; |
| 847 | - m_functions.clear(); | ||
| 848 | m_names.clear(); | 847 | m_names.clear(); |
| 848 | + m_functions.clear(); | ||
| 849 | m_tests.clear(); | 849 | m_tests.clear(); |
| 850 | m_stack_try.clear(); | 850 | m_stack_try.clear(); |
| 851 | m_index = 0; | 851 | m_index = 0; |
| @@ -873,9 +873,8 @@ void GTestSuite::copy_members(const GTestSuite& suite) | @@ -873,9 +873,8 @@ void GTestSuite::copy_members(const GTestSuite& suite) | ||
| 873 | { | 873 | { |
| 874 | // Copy members | 874 | // Copy members |
| 875 | m_name = suite.m_name; | 875 | m_name = suite.m_name; |
| 876 | - m_functions = suite.m_functions; | ||
| 877 | m_names = suite.m_names; | 876 | m_names = suite.m_names; |
| 878 | - m_tests = suite.m_tests; | 877 | + m_functions = suite.m_functions; |
| 879 | m_stack_try = suite.m_stack_try; | 878 | m_stack_try = suite.m_stack_try; |
| 880 | m_index = suite.m_index; | 879 | m_index = suite.m_index; |
| 881 | m_failures = suite.m_failures; | 880 | m_failures = suite.m_failures; |
| @@ -900,7 +899,8 @@ void GTestSuite::free_members(void) | @@ -900,7 +899,8 @@ void GTestSuite::free_members(void) | ||
| 900 | { | 899 | { |
| 901 | // Delete test cases | 900 | // Delete test cases |
| 902 | for (int i = 0; i < m_tests.size(); ++i) { | 901 | for (int i = 0; i < m_tests.size(); ++i) { |
| 903 | - delete m_tests[i]; | 902 | + delete m_tests[i]; |
| 903 | + m_tests[i] = NULL; | ||
| 904 | } | 904 | } |
| 905 | 905 | ||
| 906 | // Close logger | 906 | // Close logger |