>From 4639fa4fcd0f7a168f1bb37574eb0e0b3516aeaf Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Tue, 21 May 2013 18:15:32 +0200
Subject: [PATCH] Remove empty directories after tests run.

Files common_dom.c and common_tev.c were moved to libsss_test_common.la.
Empty directory tests_path was removed in function test_dom_suite_cleanup.
Function test_dom_suite_cleanup was reused in tests.
---
 Makefile.am                     | 10 +++++-----
 src/tests/common_dom.c          |  8 ++++++++
 src/tests/simple_access-tests.c | 14 ++------------
 src/tests/sysdb-tests.c         | 18 +++---------------
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 94ad8c04afbb8ca5b340faf669b93bca00623aba..93cdb0679a05b122c24e606e1dd6e09474db9f0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -872,7 +872,9 @@ libsss_test_common_la_SOURCES = \
 
 if HAVE_CHECK
 libsss_test_common_la_SOURCES += \
-    src/tests/common_check.c	 \
+    src/tests/common_check.c \
+    src/tests/common_dom.c \
+    src/tests/common_tev.c \
     src/tests/leak_check.c
 
 sysdb_tests_DEPENDENCIES = \
@@ -1227,8 +1229,6 @@ TEST_MOCK_OBJ = 		\
 
 TEST_MOCK_RESP_OBJ = \
      $(TEST_MOCK_OBJ) \
-     src/tests/common_tev.c \
-     src/tests/common_dom.c \
      src/tests/cmocka/common_mock_resp.c \
      src/responder/common/responder_packet.c \
      src/responder/common/responder_cmd.c \
@@ -1254,6 +1254,7 @@ nss_srv_tests_LDFLAGS = \
     -Wl,-wrap,sss_cmd_done
 nss_srv_tests_LDADD = \
     $(CMOCKA_LIBS) \
+    libsss_test_common.la \
     libsss_idmap.la \
     libsss_util.la
 
@@ -1289,8 +1290,6 @@ dyndns_tests_DEPENDENCIES = \
 dyndns_tests_SOURCES = \
      $(TEST_MOCK_OBJ) \
      $(SSSD_RESOLV_OBJ) \
-     src/tests/common_tev.c \
-     src/tests/common_dom.c \
      src/tests/cmocka/test_dyndns.c \
      src/providers/data_provider_opts.c
 dyndns_tests_CFLAGS = \
@@ -1303,6 +1302,7 @@ dyndns_tests_LDFLAGS = \
 dyndns_tests_LDADD = \
     $(CARES_LIBS) \
     $(CMOCKA_LIBS) \
+    libsss_test_common.la \
     libsss_util.la
 endif
 
diff --git a/src/tests/common_dom.c b/src/tests/common_dom.c
index 00e7f5ae2bfc972b8a61982c54bc5df70cbbcb20..661271d3b416d222525e9ecb1af72ba532170ed6 100644
--- a/src/tests/common_dom.c
+++ b/src/tests/common_dom.c
@@ -156,6 +156,14 @@ void test_dom_suite_cleanup(const char *tests_path,
                errno, strerror(errno)));
     }
 
+    errno = 0;
+    ret = rmdir(tests_path);
+    if (ret != 0) {
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              ("Could not delete the test dir (%d) (%s)\n",
+               errno, strerror(errno)));
+    }
+
     talloc_free(conf_db);
     talloc_free(sys_db);
 }
diff --git a/src/tests/simple_access-tests.c b/src/tests/simple_access-tests.c
index 4c78400267f1ac3de9678708ace72632b89afbe9..48ebea6f79ae8d5b414cfaab14cb4b4f04338490 100644
--- a/src/tests/simple_access-tests.c
+++ b/src/tests/simple_access-tests.c
@@ -540,7 +540,6 @@ int main(int argc, const char *argv[])
     int opt;
     poptContext pc;
     int number_failed;
-    int ret;
 
     struct poptOption long_options[] = {
         POPT_AUTOHELP
@@ -573,17 +572,8 @@ int main(int argc, const char *argv[])
     number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
 
-    ret = unlink(TESTS_PATH"/"TEST_CONF_FILE);
-    if (ret != EOK) {
-        fprintf(stderr, "Could not delete the test config ldb file (%d) (%s)\n",
-                errno, strerror(errno));
-        return EXIT_FAILURE;
-    }
-    ret = unlink(TESTS_PATH"/"LOCAL_SYSDB_FILE);
-    if (ret != EOK) {
-        fprintf(stderr, "Could not delete the test config ldb file (%d) (%s)\n",
-                errno, strerror(errno));
-        return EXIT_FAILURE;
+    if (number_failed == 0) {
+        test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_FILE, LOCAL_SYSDB_FILE);
     }
 
     return (number_failed==0 ? EXIT_SUCCESS : EXIT_FAILURE);
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index b30f2ed4c8e73663396e9628e5523b5fe652759a..0965accc508320698ffcd804aa895c67a09d53a3 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -5292,21 +5292,9 @@ int main(int argc, const char *argv[]) {
     srunner_run_all(sr, CK_ENV);
     failure_count = srunner_ntests_failed(sr);
     srunner_free(sr);
+
     if (failure_count == 0 && !no_cleanup) {
-        ret = unlink(TESTS_PATH"/"TEST_CONF_FILE);
-        if (ret != EOK) {
-            fprintf(stderr, "Could not delete the test config ldb file (%d) (%s)\n",
-                    errno, strerror(errno));
-            return EXIT_FAILURE;
-        }
-        ret = unlink(TESTS_PATH"/"LOCAL_SYSDB_FILE);
-        if (ret != EOK) {
-            fprintf(stderr, "Could not delete the test config ldb file (%d) (%s)\n",
-                    errno, strerror(errno));
-            return EXIT_FAILURE;
-        }
-
-        return EXIT_SUCCESS;
+        test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_FILE, LOCAL_SYSDB_FILE);
     }
-    return  EXIT_FAILURE;
+    return (failure_count==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
-- 
1.8.1.4