Accepting request 959438 from home:jsmeix:branches:Printing

Do not error out when make test fails

OBS-URL: https://build.opensuse.org/request/show/959438
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=383

cups.changes

@@ -1,8 +1,12 @@
 -------------------------------------------------------------------
-Fri Mar  4 08:33:46 UTC 2022 - jsmeix@suse.de
+Fri Mar  4 11:34:13 UTC 2022 - jsmeix@suse.de
 
 - Improved comments in spec file and in changes file
 - Have cups.keyring in ASCII armored format
+- Do not error out when 'make test' fails in the 'check' section
+  because https://github.com/OpenPrinting/cups/issues/155
+  is not yet actually fixed so currently the testsuite
+  still sometimes fails
 
 -------------------------------------------------------------------
 Tue Mar  1 18:16:11 UTC 2022 - Aurelien Joga <aurelienjoga@gmail.com>
@@ -150,12 +154,12 @@ Tue Mar  1 18:16:11 UTC 2022 - Aurelien Joga <aurelienjoga@gmail.com>
 - Dropped patch cups-2.1.0-cups-systemd-socket.patch
   because it is included in this release, see
   https://github.com/OpenPrinting/cups/commit/e96e96b4bd0d4e6f634bbb66b95d6e475501541c
-- Changed upstream source packages signing key, see
+- Updated upstream source tarball signing key in cups.keyring, see
   https://github.com/OpenPrinting/cups/discussions/327#discussioncomment-2060579
-- Re-enabled testsuite
+- Re-enabled the CUPS upstream testsuite via 'make test'
-  * Also removed make check because since upstream change
+  and removed 'make check' because since the upstream commit
-    the two target are identical, see
+  https://github.com/OpenPrinting/cups/commit/96ba46ebc818b610b0e40cbc9d62ef1dcd3ec9b6
-    https://github.com/OpenPrinting/cups/commit/96ba46ebc818b610b0e40cbc9d62ef1dcd3ec9b6#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52R239
+  the two Makefile targets 'test' and 'check' are identical.
 - Changed cups-2.1.0-cups-systemd-socket.patch
   to accomodate new coding style
 - Changed cups-config-libs.orig to accommodate
@@ -174,8 +178,9 @@ Tue Feb  1 09:18:27 UTC 2022 - jsmeix@suse.de
 -------------------------------------------------------------------
 Fri Oct 15 07:31:10 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
-- Added hardening to systemd service(s) (bsc#1181400). Added patch(es):
+- Added hardening to systemd service(s) (bsc#1181400), see
-  * harden_cups.service.patch
+  https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+  Added patch: harden_cups.service.patch
 
 -------------------------------------------------------------------
 Mon Jun  7 13:23:25 CEST 2021 - jsmeix@suse.de

cups.spec

@@ -16,8 +16,11 @@
 #
 
 
-# Cf. https://rpm.org/user_doc/conditional_builds.html
+# By default enable testsuite (i.e. in the 'check' section run 'make test')
-# by default enable testsuite (i.e. in the 'check' section run make check and make test)
+# cf. https://rpm.org/user_doc/conditional_builds.html
+# To disable the testsuite you may set 'bcond_with testsuite' instead
+# until https://github.com/OpenPrinting/cups/issues/155 is actually fixed
+# but we do not error out when 'make test' fails (see the 'check' section):
 %bcond_without testsuite
 
 # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2
@@ -441,13 +444,31 @@ EOF
 
 %check
 %if %{with testsuite}
-# There appears to be some kind of race condition when running make check and make test
+# There appears to be some kind of race condition when running 'make test'
 # cf. https://github.com/OpenPrinting/cups/issues/155
-# We print all logs for debugging purposes if either testsuite fails
+# so we do not call 'make %{?_smp_mflags} test' but plain 'make test'
-echo "DEBUG: running make test"
+# cf. https://github.com/OpenPrinting/cups/issues/155#issuecomment-802886811
-bash -c 'make %{?_smp_mflags} test; EXIT=$?; if [ $EXIT -ne 0 ]; then cat test/*_log*-$(whoami); fi; exit $EXIT'
+# We print the log files for debugging purposes if the testsuite fails.
+# The log files in the test directory are named like
+# access_log-2022-03-04-abuild
+# debug_log-2022-03-04-abuild
+# error_log-2022-03-04-abuild
+# page_log-2022-03-04-abuild
+# We do not error out because https://github.com/OpenPrinting/cups/issues/155
+# is not yet actually fixed so currently the testsuite still sometimes fails:
+echo "TEST: running 'make test'"
+if make test
+then echo "TEST: succeeded"
+else echo "TEST: 'make test' FAILED"
+     for logfile in test/*_log-*-$(whoami)
+     do echo "TEST: printing log file $logfile:"
+        cat $logfile
+        echo "TEST: end of log file $logfile"
+     done
+     echo "TEST: end of printing log files"
+fi
 %else
-echo "DEBUG: skipped running make check and make test, cf. https://github.com/OpenPrinting/cups/issues/155"
+echo "TEST: skipped 'make test', cf. https://github.com/OpenPrinting/cups/issues/155"
 %endif
 
 %pre -p /bin/bash