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 b7f06f69abb1b28e7cbd2af23bbec3cc7f512b20..9fcdad8e91ea19a39201553e8ddbf8ac65433789 100644 (file)
--- 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 75baac580c2376bd0c43f9a64498d3805d6fff93..8c1a1c8e8d9f021c3d92d6b81f24c31b8a650ac4 100644 (file)
--- 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 82944cf76aa9598afd0a6050e54a280993663c68..c41506773b47346b14345f28f371e611631fdf87 100644 (file)
--- 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 d1fbb52b625b7ab53795d99e21d0db1edaa582e4..5e7b60b474e1c01ab13955003cf1bb2d4f7f164f 100644 (file)
--- 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";        \