diff --git a/src/tests/cmocka/data_provider/test_dp_request.c b/src/tests/cmocka/data_provider/test_dp_request.c index bcfcbf1..ebe5188 100644 --- a/src/tests/cmocka/data_provider/test_dp_request.c +++ b/src/tests/cmocka/data_provider/test_dp_request.c @@ -412,6 +412,7 @@ int main(int argc, const char *argv[]) { poptContext pc; int opt; + int rv; int no_cleanup = 0; struct poptOption long_options[] = { POPT_AUTOHELP @@ -459,5 +460,10 @@ int main(int argc, const char *argv[]) test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); test_dom_suite_setup(TESTS_PATH); - return cmocka_run_group_tests(tests, NULL, NULL); + rv = cmocka_run_group_tests(tests, NULL, NULL); + if (rv == 0 && !no_cleanup) { + test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); + } + + return rv; } diff --git a/src/tests/cmocka/data_provider/test_dp_special.c b/src/tests/cmocka/data_provider/test_dp_special.c index 73e3019..b534659 100644 --- a/src/tests/cmocka/data_provider/test_dp_special.c +++ b/src/tests/cmocka/data_provider/test_dp_special.c @@ -140,6 +140,7 @@ int main(int argc, const char *argv[]) { poptContext pc; int opt; + int rv; int no_cleanup = 0; struct poptOption long_options[] = { POPT_AUTOHELP @@ -181,5 +182,10 @@ int main(int argc, const char *argv[]) test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); test_dom_suite_setup(TESTS_PATH); - return cmocka_run_group_tests(tests, NULL, NULL); + rv = cmocka_run_group_tests(tests, NULL, NULL); + if (rv == 0 && !no_cleanup) { + test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); + } + + return rv; }