From f809ba14df46558ba67ed0b6c3b8a31658774283 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 6 Sep 2022 20:40:14 -0400 Subject: build: Fix regex in make check make check fails when /bin/sh is dash, since dash doesn't support $''. Commit 37dc3f5 ("build: check for trailing whitespace") added the $'' usage, presumably because it was noticed that grep doesn't accept \t. Fix this by using [:blank:] instead. Bug: https://bugs.gentoo.org/856436 --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3cdbcb8..8126a0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,5 +18,5 @@ apns-conf.xml: $(top_srcdir)/apns-conf.xsl $(top_srcdir)/$(SP_XML_DB) pkgdata_DATA = apns-conf.xml check-local: - grep $$'^[\t ]* <\|[ \t]$$' serviceproviders.xml && exit 1 || : + grep '^[[:blank:]]* <\|[[:blank:]]$$' serviceproviders.xml && exit 1 || : xmllint --valid $(top_srcdir)/$(SP_XML_DB) 2>&1 >/dev/null -- cgit v1.2.1 From 684ed297a7fd01ae2ee0e37d489bc8fbc9178fb9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 7 Sep 2022 13:59:10 +0200 Subject: build: reject and whitespace in XML via unit test Note only reject a whitespace right before "<", but also in between tabs. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8126a0e..9de5196 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,5 +18,5 @@ apns-conf.xml: $(top_srcdir)/apns-conf.xsl $(top_srcdir)/$(SP_XML_DB) pkgdata_DATA = apns-conf.xml check-local: - grep '^[[:blank:]]* <\|[[:blank:]]$$' serviceproviders.xml && exit 1 || : + grep '^[[:blank:]]* [[:blank:]]*<\|[[:blank:]]$$' serviceproviders.xml && exit 1 || : xmllint --valid $(top_srcdir)/$(SP_XML_DB) 2>&1 >/dev/null -- cgit v1.2.1 From d8e0306638d2c7fb72d43ce7a30ea2ccf9287c15 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 7 Sep 2022 14:02:07 +0200 Subject: build: use $(SP_XML_DB) in Makefile.am --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 9de5196..327a66b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,5 +18,5 @@ apns-conf.xml: $(top_srcdir)/apns-conf.xsl $(top_srcdir)/$(SP_XML_DB) pkgdata_DATA = apns-conf.xml check-local: - grep '^[[:blank:]]* [[:blank:]]*<\|[[:blank:]]$$' serviceproviders.xml && exit 1 || : + grep '^[[:blank:]]* [[:blank:]]*<\|[[:blank:]]$$' $(top_srcdir)/$(SP_XML_DB) && exit 1 || : xmllint --valid $(top_srcdir)/$(SP_XML_DB) 2>&1 >/dev/null -- cgit v1.2.1