From: Terry Burton <tez@terryburton.co.uk>
Date: Fri, 21 Oct 2022 17:46:39 +0000 (+0100)
Subject: tests: Ignore spurious output from jlibtool with VERBOSE=1 (#4781)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8151f32b3b5be9bf455dd63653375539229751a;p=thirdparty%2Ffreeradius-server.git

tests: Ignore spurious output from jlibtool with VERBOSE=1 (#4781)
---

diff --git a/src/tests/map/all.mk b/src/tests/map/all.mk
index b7f06f69abb..9fcdad8e91e 100644
--- a/src/tests/map/all.mk
+++ b/src/tests/map/all.mk
@@ -44,6 +44,7 @@ $(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_map
 			touch "$@"; \
 		fi \
 	else \
+		sed -i.bak -e '$${/Executing: /d;}' "$@.log"; \
 		if ! diff "$<.log" "$@.log"; then \
 			echo "FAILED: diff \"$<.log\" \"$@.log\""; \
 			echo "FAILED: $(MAP_UNIT) -d $(top_srcdir)/raddb -D $(top_srcdir)/share/dictionary -r \"$@\" \"$<\""; \
diff --git a/src/tests/radclient/all.mk b/src/tests/radclient/all.mk
index 75baac580c2..8c1a1c8e8d9 100644
--- a/src/tests/radclient/all.mk
+++ b/src/tests/radclient/all.mk
@@ -58,14 +58,17 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
 #
 #	Lets normalize the loopback interface on OSX and FreeBSD
 #
-	$(Q)if [ "$$(uname -s)" = "Darwin" ]; then sed -i .bak 's/via lo0/via lo/g' $(FOUND); fi
-	$(Q)if [ "$$(uname -s)" = "FreeBSD" ]; then sed -i .bak 's/via (null)/via lo/g' $(FOUND); fi
+	$(Q)if [ "$$(uname -s)" = "Darwin" ]; then sed -i.bak 's/via lo0/via lo/g' $(FOUND); fi
+	$(Q)if [ "$$(uname -s)" = "FreeBSD" ]; then sed -i.bak 's/via (null)/via lo/g' $(FOUND); fi
 #
 #	Remove all entries with "^_EXIT.*CALLED .*/"
 #	It is necessary to match all builds with/without -DNDEBUG
 #
-	$(Q)mv -f $(FOUND) $(FOUND).bak
-	$(Q)sed '/^_EXIT.*CALLED .*/d' $(FOUND).bak > $(FOUND)
+	$(Q)sed -i.bak '/^_EXIT.*CALLED .*/d' $(FOUND)
+#
+#	Ignore spurious output from jlibtool when VERBOSE=1
+#
+	$(Q)sed -i.bak '$${/Executing: /d;}' $(FOUND)
 #
 #	Checking.
 #
diff --git a/src/tests/radmin/all.mk b/src/tests/radmin/all.mk
index 82944cf76aa..c41506773b4 100644
--- a/src/tests/radmin/all.mk
+++ b/src/tests/radmin/all.mk
@@ -69,6 +69,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
 		$(MAKE) --no-print-directory test.radmin.radiusd_kill; \
 		exit 1; \
 	fi; \
+	sed -i.bak -e '$${/Executing: /d;}' $(FOUND); \
 	if ! cmp -s $(FOUND) $(EXPECTED); then \
 		echo "RADMIN FAILED $@"; \
 		echo "RADIUSD: $(RADIUSD_RUN)"; \
diff --git a/src/tests/radsniff/all.mk b/src/tests/radsniff/all.mk
index d1fbb52b625..5e7b60b474e 100644
--- a/src/tests/radsniff/all.mk
+++ b/src/tests/radsniff/all.mk
@@ -59,6 +59,7 @@ $(OUTPUT)/%.txt: $(DIR)/%.txt $(TEST_BIN_DIR)/radsniff $(PCAP_IN)
 	fi
 	$(Q)if [ -e "$(EXPECTED)" ]; then                                                                     \
 		grep -v "^#" $(EXPECTED) > $(FOUND).result || true;                                           \
+		sed -i.bak -e '$${/Executing: /d;}' $(FOUND);                                                 \
 		if ! cmp $(FOUND) $(FOUND).result; then                                                       \
 			echo "RADSNIFF FAILED $@";                                                                \
 			echo "RADSNIFF: $(TEST_BIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary -xx";        \