Use destructor attribute instead of manual cleanup

src/overture/test.c

@@ -109,7 +109,8 @@ static bool summarize_tests(bool disable_colors) {
     return !failed;
 }
 
-void cleanup_tests(void) {
+[[gnu::destructor]]
+static void cleanup_tests(void) {
     test_vec_destroy(&tests);
     memset(&tests, 0, sizeof(struct test_vec));
 }

src/overture/test.h

@@ -32,7 +32,7 @@
 /// is disabled by default, use @ref filter_test to enable it based on filters.
 #define TEST(name) \
     void test_##name(struct test_context*); \
-    __attribute__((constructor)) void register_##name() { register_test(#name, test_##name); } \
+    [[gnu::constructor]] void register_##name() { register_test(#name, test_##name); } \
     void test_##name([[maybe_unused]] struct test_context* context)
 
 /// Asserts that the given condition is `true`. Fails the test if it is not the case.
@@ -60,9 +60,6 @@ bool run_tests(bool disable_colors);
 /// @param argv Prefixes to use for matching.
 void filter_tests(int argc, char** argv);
 
-/// Cleanup the memory associated with the tests.
-void cleanup_tests(void);
-
 /// Prints available test names, separated by new lines, on the given stream.
 void print_tests(FILE*);
 

test/CMakeLists.txt

@@ -30,6 +30,9 @@ target_link_libraries(unit_tests PRIVATE
 
 add_test(NAME unit_tests COMMAND unit_tests)
 add_test(NAME unit_tests_filter COMMAND unit_tests cli set str)
+add_test(NAME unit_tests_list COMMAND unit_tests --list)
+add_test(NAME unit_tests_usage COMMAND unit_tests -h)
+set_tests_properties(unit_tests_usage unit_tests_list PROPERTIES WILL_FAIL TRUE)
 add_custom_target(memcheck
     COMMAND ${CMAKE_CTEST_COMMAND} -T memcheck
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

test/main.c

@@ -34,7 +34,5 @@ int main(int argc, char** argv) {
         return 1;
 
     filter_tests(argc, argv);
-    int status = run_tests(options.disable_colors) ? 0 : 1;
-    cleanup_tests();
-    return status;
+    return run_tests(options.disable_colors) ? 0 : 1;
 }