master: Move test-auth-* unit tests to lib-auth

Now that it no longer depends on lib-master, there's no cyclic dependency
problem.

Because test-auth-master already exists, this commit temporarily creates a
second test-auth-master2.

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
index b3b59b5f3210046e3d80e3d27bf20803387fdd1e..5bf805c27669c15aa6143aad5983d4e6fa74a378 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth/Makefile.am
@@ -24,7 +24,9 @@ pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
 
 test_programs = \
-       test-auth-master
+       test-auth-client \
+       test-auth-master \
+       test-auth-master2
 
 noinst_PROGRAMS = $(test_programs)
 
@@ -45,6 +47,14 @@ test_auth_master_SOURCES = test-auth-master.c
 test_auth_master_LDADD = $(test_libs)
 test_auth_master_DEPENDENCIES = $(test_deps)
 
+test_auth_client_SOURCES = test-auth-client.c
+test_auth_client_LDADD = $(test_libs)
+test_auth_client_DEPENDENCIES = $(test_deps)
+
+test_auth_master2_SOURCES = test-auth-master2.c
+test_auth_master2_LDADD = $(test_libs)
+test_auth_master2_DEPENDENCIES = $(test_deps)
+
 check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \

diff --git a/src/master/test-auth-client.c b/src/lib-auth/test-auth-client.c
similarity index 100%
rename from src/master/test-auth-client.c
rename to src/lib-auth/test-auth-client.c

diff --git a/src/master/test-auth-master.c b/src/lib-auth/test-auth-master2.c
similarity index 100%
rename from src/master/test-auth-master.c
rename to src/lib-auth/test-auth-master2.c

diff --git a/src/master/Makefile.am b/src/master/Makefile.am
index c6ee2e730267e1e8ab2b447bda8421ee5d2544b7..d4f47e82390be590f5abf2b77face3b346446136 100644 (file)
--- a/src/master/Makefile.am
+++ b/src/master/Makefile.am
@@ -50,34 +50,3 @@ noinst_HEADERS = \
        service-process.h \
        service-process-notify.h \
        service.h
-
-test_programs = \
-       test-auth-client \
-       test-auth-master
-
-test_nocheck_programs =
-
-noinst_PROGRAMS = $(test_programs) $(test_nocheck_programs)
-
-test_libs = \
-       ../lib-auth/libauth.la \
-       ../lib-test/libtest.la \
-       ../lib/liblib.la
-
-test_deps = \
-       ../lib-auth/libauth.la \
-       ../lib-test/libtest.la \
-       ../lib/liblib.la
-
-test_auth_client_SOURCES = test-auth-client.c
-test_auth_client_LDADD = $(test_libs)
-test_auth_client_DEPENDENCIES = $(test_deps)
-
-test_auth_master_SOURCES = test-auth-master.c
-test_auth_master_LDADD = $(test_libs)
-test_auth_master_DEPENDENCIES = $(test_deps)
-
-check-local:
-       for bin in $(test_programs); do \
-         if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
-       done