"make test" now runs the automated test suite.

"make debugtest" now runs the automated test suite with debug printfs enabled.

The old "check" and "debugcheck" targets are still active, however "test" is the
canonical test suite target for most open source projects and CI environments.

The old "test" target behavior is available by running "make testserver" - as
before you can choose to run a more agressive automated test or just run the
test server in the background.

diff --git a/CHANGES-OPENPRINTING.md b/CHANGES-OPENPRINTING.md
index 5c2c161a48cc38a66e532dff5a3117063b5b9de0..e124e0be35a5f6563e61348639a016ebd84af51b 100644 (file)
--- a/CHANGES-OPENPRINTING.md
+++ b/CHANGES-OPENPRINTING.md
@@ -4,6 +4,10 @@ Changes in OpenPrinting CUPS
 Changes in CUPS v2.3.3op1
 -------------------------
 
+- The automated test suite can now be activated using `make test` for
+  consistency with other projects and CI environments - the old `make check`
+  continues to work as well, and the previous test server behavior can be
+  accessed by running `make testserver`.
 - ippeveprinter now supports multiple icons and strings files.
 - ippeveprinter now uses the system's FQDN with Avahi.
 - ippeveprinter now supports Get-Printer-Attributes on "/".

diff --git a/INSTALL.md b/INSTALL.md
index 37cc94b6b01ef03dbe93bc063277ad079fbaff03..e2fb5006ec59ee812a83f9ddcc70c7efeab132ee 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.3.3 - 2020-04-24
-==================================
+INSTALL - CUPS v2.3.3op1 - 2020-11-22
+=====================================
 
 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.md".  A complete change log can
@@ -130,11 +130,11 @@ TESTING THE SOFTWARE
 Aside from the built-in unit tests, CUPS includes an automated test framework
 for testing the entire printing system.  To run the tests, just type:
 
-    make check ENTER
+    make test ENTER
 
 or if you have FreeBSD, NetBSD, or OpenBSD type:
 
-    gmake check ENTER
+    gmake test ENTER
 
 The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631 in
 /tmp/cups-$USER and produces a nice HTML report of the results.

diff --git a/Makefile b/Makefile
index 15544627f6cd0c6975d8409f790162dbade0f01d..638df2602d1827b0edffd5acbc46a535ce5d0b57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 #
 # Top-level Makefile for CUPS.
 #
+# Copyright © 2020 by Michael R Sweet
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -230,16 +231,16 @@ uninstall:
 # Run the test suite...
 #
 
-test:  all unittests
-       echo Running CUPS test suite...
+testserver:    all unittests
+       echo Running CUPS test server...
        cd test; ./run-stp-tests.sh $(TESTOPTIONS)
 
 
-check: all unittests
-       echo Running CUPS test suite with defaults...
+check test:    all unittests
+       echo Running CUPS test suite...
        cd test; ./run-stp-tests.sh 1 0 n n
 
-debugcheck:    all unittests
+debugcheck debugtest:  all unittests
        echo Running CUPS test suite with debug printfs...
        cd test; ./run-stp-tests.sh 1 0 n y