On 10/3/24 08:04, Paul Eggert wrote:
I installed the attached (plus some other refactorings) to do that.

I don't see test-suite failures anymore, thanks.

> [PATCH] ls: tune indicator_name

This change makes 'check-ls-dircolors' and therefore 'distcheck' fail.
The attached fixes the check.

Have a nice day,
Berny
From 0911361e79cddc2ffeab043f9ff120c19431384a Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <m...@bernhard-voelker.de>
Date: Sun, 6 Oct 2024 16:09:26 +0200
Subject: [PATCH] maint: adjust check-ls-dircolors to recent change in ls.c

'make distcheck' would fail since commit 75b34c77e43a, because the
comparison by check-ls-dircolors fails.

* Makefile.am (check-ls-dircolors): Adjust sed(1) expression to the
changed data initialization.
---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 3fd546599..d17353e1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,7 +133,8 @@ check-ls-dircolors:
 	  |sed -n 's/^"\(..\)"/\1/p'|sort -u);			\
 	ls=$$(sed -n '/static.*indicator_name\[/,/};'/\p	\
 	    $(srcdir)/src/ls.c					\
-	  |sed -n '/^  *"/p'|tr , '\n'|sed 's/^  *//'		\
+	  |sed -n '/^  *{/ { s/{.\([a-z]\).,.\([a-z]\).}/"\1\2"/g; p; }' \
+	  |tr , '\n'|sed 's/^  *//'		\
 	  |sed -n 's/^"\(..\)"/\1/p'|sort -u);			\
 	test "$$dc" = "$$ls"
 
-- 
2.46.0

Reply via email to