From 61a9e419eec22493f7b07d9eeee4096525465f93 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Fri, 29 Dec 2023 09:16:00 -0500
Subject: [PATCH] Final cleanup for 'make unittests' to be separate from 'make
 test' (Issue #612)

---
 backend/Makefile   |  7 +++++++
 cgi-bin/Makefile   | 14 ++++++++++----
 scheduler/Makefile | 22 +++++++++++-----------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index d53e971d18..2074e4ce85 100644
--- 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 5a1b4e5004..00ff4a5460 100644
--- 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 e00d62c8ec..9d6f3a02b3 100644
--- 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".
 #