Final cleanup for 'make unittests' to be separate from 'make test' (Issue #612)

diff --git a/backend/Makefile b/backend/Makefile
index d53e971d18da22aadc1e41f815c6fbef3a2bcfca..2074e4ce85a729a18d02784376835ab551f69bd3 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -171,6 +171,13 @@ uninstall:
        -$(RMDIR) $(SERVERBIN)
 
 
+#
+# Run unit tests... (doesn't actually run these currently)
+#
+
+test:  unittests
+
+
 #
 # test1284
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 5a1b4e5004a13fd24406ff35e52a8e2d02ca0b16..00ff4a54604cb82be50317601310b7143a436e00 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -141,6 +141,16 @@ uninstall:
        -$(RMDIR) $(SERVERBIN)/cgi-bin
 
 
+#
+# Run unit tests...
+#
+
+test:  unittests
+       echo Testing CGI API...
+       ./testcgi
+       echo Testing help index API...
+       ./testhi
+
 #
 # libcupscgi.a
 #
@@ -211,8 +221,6 @@ testcgi:    testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcgi.o libcupscgi.a \
                $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       echo Testing CGI API...
-       ./testcgi
 
 
 #
@@ -224,8 +232,6 @@ testhi:     testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhi.o libcupscgi.a \
                $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       echo Testing help index API...
-       ./testhi
 
 
 #

diff --git a/scheduler/Makefile b/scheduler/Makefile
index e00d62c8ec7740115ecb422cd70bcff35c75c97b..9d6f3a02b3b7502389fd250846e963589f923dac 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -101,17 +101,6 @@ libs:
 unittests:     $(UNITTARGETS)
 
 
-#
-# Run unit tests...
-#
-
-test:          unittests
-       echo "Tests started at $(date)..." >test.log
-       echo Running MIME API tests...
-       ./testmime >>test.log
-       echo "Tests finished at $(date)..." >>test.log
-
-
 #
 # Clean all object files...
 #
@@ -321,6 +310,17 @@ uninstall:
        fi
 
 
+#
+# Run unit tests...
+#
+
+test:          unittests
+       echo "Tests started at $(date)..." >test.log
+       echo Running MIME API tests...
+       ./testmime >>test.log
+       echo "Tests finished at $(date)..." >>test.log
+
+
 #
 # Make the scheduler executable, "cupsd".
 #