From af90456043bb2e8a0de9e4fc70e82f4e2ff4b4c0 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 25 Sep 2023 09:17:18 -0400 Subject: Makefile.am: Automake broke the test suite summary Because of this in our Makefile.am: PACKAGE_VERSION_GIT = $$(git describe --tags --dirty | sed 's|^[^/-]*[/-]||') PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION_GIT) and this in Automake lib/am/check.am since version 1.16.3: AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' the test suite summary header came out like this: ============================================================================ /bin/bash: line 64: ^[^/-]*[/-]: No such file or directory /bin/bash: line 64: $')\E[m': command not found ============================================================================ but is now fixed to look like this: ============================================================================ Testsuite summary for opkbuild 4.2.2-3-gcc09f4e-dirty ============================================================================ --- diff --git a/Makefile.am b/Makefile.am index 3cbf383..f3dbfbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,10 @@ endif # * Our release target PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION_GIT) +# Automake lib/am/check.am since version 1.16.3 defines this with single quotes, +# which breaks PACKAGE_VERSION_GIT above. +AM_TESTSUITE_SUMMARY_HEADER = " for $(PACKAGE_STRING)" + SUFFIXES = .sh .sho SHOBJEXT = sho diff --git a/NEWS b/NEWS index 2ea268b..37d7078 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,11 @@ libopkbuild: * ProteanOS source package versions may now contain epochs. This complies with the latest draft of SPF 2.0. +Build system: + + * The test suite summary is fixed, after being broken by GNU Automake + since version 1.16.3. + opkbuild version 4.2.2 ---------------------- -- cgit v0.9.1