From: Jorge Pereira Date: Mon, 11 Nov 2019 17:33:03 +0000 (-0300) Subject: Allow verbosity only where is important (#3114) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2550aa904ae2faced4b42c687ebbf8c0ef1ea978;p=thirdparty%2Ffreeradius-server.git Allow verbosity only where is important (#3114) --- diff --git a/src/tests/auth/all.mk b/src/tests/auth/all.mk index 78cad7d9ba2..8baa0e41b7a 100644 --- a/src/tests/auth/all.mk +++ b/src/tests/auth/all.mk @@ -93,7 +93,7 @@ AUTH_LIBS := $(addsuffix .la,$(addprefix rlm_,$(AUTH_MODULES))) # ERROR line in the input. # $(OUTPUT)/%: $(DIR)/% $(OUTPUT)/%.attrs $(TESTBINDIR)/unit_test_module | $(AUTH_RADDB) $(AUTH_LIBS) build.raddb - ${Q}echo AUTH-TEST $(notdir $@) + @echo "AUTH-TEST $(notdir $@)" ${Q}if ! TESTDIR=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx > "$@.log" 2>&1 || ! test -f "$@"; then \ if ! grep ERROR $< 2>&1 > /dev/null; then \ cat $@.log; \ diff --git a/src/tests/bin/all.mk b/src/tests/bin/all.mk index 300bcdf958f..f55f900e281 100644 --- a/src/tests/bin/all.mk +++ b/src/tests/bin/all.mk @@ -27,7 +27,7 @@ $(eval $(call TEST_BOOTSTRAP)) # that we're running # $(BUILD_DIR)/tests/bin/%: $(DIR)/% % - ${Q}echo BIN-TEST $(notdir $@) + @echo "BIN-TEST $(notdir $@)" ${Q}if ! TESTBIN="$(TESTBIN)" DICT_DIR="$(top_srcdir)/share/dictionary" $<; then \ echo TESTBIN=\"$(TESTBIN)\" DICT_DIR="$(top_srcdir)/share/dictionary" $<; \ exit 1; \ diff --git a/src/tests/dict/all.mk b/src/tests/dict/all.mk index 1ff105e084e..764e4d1f2c0 100644 --- a/src/tests/dict/all.mk +++ b/src/tests/dict/all.mk @@ -16,7 +16,7 @@ $(eval $(call TEST_BOOTSTRAP)) # "foo_dir" directory, and copy "foo" into "foo_dir/dictionary" # $(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_attribute - ${Q}echo DICT-TEST $(notdir $@) + @echo "DICT-TEST $(notdir $@)" ${Q}mkdir -p $@_dir ${Q}cp $< $@_dir/dictionary ${Q}if ! $(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d "$@_dir" -r "$@" -xxx "$(dir $<)/empty.txt" > "$@.log" 2>&1 || ! test -f "$@"; then \ diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk index 56093c23db4..7490bae2ea7 100644 --- a/src/tests/eapol_test/all.mk +++ b/src/tests/eapol_test/all.mk @@ -48,7 +48,7 @@ $(eval $(call RADIUSD_SERVICE,servers,$(OUTPUT))) # Print the disabled list. # $(IGNORED_EAP_TYPES): - ${Q}echo "EAPOL_TEST $@ - Disabled. Enable by removing '$@' from 'IGNORED_EAP_TYPES' in src/tests/eapol_test/all.mk" + @echo "EAPOL_TEST $@ - Disabled. Enable by removing '$@' from 'IGNORED_EAP_TYPES' in src/tests/eapol_test/all.mk" # # Separate the dependencies here just to keep a bit clear. @@ -64,7 +64,7 @@ $(OUTPUT)/%.ok: $(DIR)/%.conf | $(GENERATED_CERT_FILES) ${Q} [ -f $(dir $@)/radiusd.pid ] || exit 1 $(eval OUT := $(patsubst %.conf,%.log,$@)) $(eval KEY := $(shell grep key_mgmt=NONE $< | sed 's/key_mgmt=NONE/-n/')) - ${Q}echo EAPOL_TEST $(notdir $(patsubst %.conf,%,$<)) + @echo "EAPOL_TEST $(notdir $(patsubst %.conf,%,$<))" ${Q}if ! $(EAPOL_TEST) -t 2 -c $< -p $(PORT) -s $(SECRET) $(KEY) > $(OUT) 2>&1; then \ echo "Last entries in supplicant log ($(patsubst %.conf,%.log,$@)):"; \ tail -n 40 "$(patsubst %.conf,%.log,$@)"; \ @@ -97,5 +97,5 @@ $(shell touch "$(OUTPUT)/eapol_test.skip") endif $(TEST): $(OUTPUT) - ${Q}echo "Retry with: $(MAKE) clean.$@ && $(MAKE) $@" + @echo "Retry with: $(MAKE) clean.$@ && $(MAKE) $@" endif diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk index ac5c0425f53..07b644a426d 100644 --- a/src/tests/keywords/all.mk +++ b/src/tests/keywords/all.mk @@ -101,7 +101,7 @@ KEYWORD_LIBS := $(addsuffix .la,$(addprefix rlm_,$(KEYWORD_MODULES))) rlm_exampl # ERROR line in the input. # $(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_module | $(KEYWORD_RADDB) $(KEYWORD_LIBS) build.raddb rlm_cache_rbtree.la rlm_test.la rlm_csv.la - ${Q}echo KEYWORD-TEST $(notdir $@) + @echo "KEYWORD-TEST $(notdir $@)" ${Q}if [ -f $<.attrs ] ; then \ cp $<.attrs $(BUILD_DIR)/tests/keywords/; \ else \ diff --git a/src/tests/map/all.mk b/src/tests/map/all.mk index b2ff0ae0c51..0fc95fcdb8d 100644 --- a/src/tests/map/all.mk +++ b/src/tests/map/all.mk @@ -24,7 +24,7 @@ MAP_UNIT := $(TESTBIN)/unit_test_map # Re-run the tests if the input file changes # $(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_map - ${Q}echo MAP-TEST $(notdir $<) + @echo "MAP-TEST $(notdir $<)" ${Q}if ! $(MAP_UNIT) -d $(top_srcdir)/raddb -D $(top_srcdir)/share/dictionary -r "$@" "$<" > "$@.log" 2>&1 || ! test -f "$@"; then \ if ! grep ERROR $< 2>&1 > /dev/null; then \ cat "$@.log"; \ diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk index b67a2761513..a0fec373c54 100644 --- a/src/tests/unit/all.mk +++ b/src/tests/unit/all.mk @@ -34,7 +34,7 @@ $(FILES.$(TEST)): export TZ = GMT # $(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_attribute $(eval DIR:=${top_srcdir}/src/tests/unit) - ${Q}echo UNIT-TEST $(subst $(DIR)/,,$<) + @echo "UNIT-TEST $(subst $(DIR)/,,$<)" ${Q}if ! $(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d $(DIR) -r "$@" $<; then \ echo "$(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d $(DIR) -r \"$@\" $<"; \ rm -f $(BUILD_DIR)/tests/test.unit; \ diff --git a/src/tests/xlat/all.mk b/src/tests/xlat/all.mk index 34a23605e29..bffa5d38c7d 100644 --- a/src/tests/xlat/all.mk +++ b/src/tests/xlat/all.mk @@ -21,7 +21,7 @@ $(eval $(call TEST_BOOTSTRAP)) # And the actual script to run each test. # $(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_module | build.raddb - ${Q}echo XLAT-TEST $(notdir $@) + @echo "XLAT-TEST $(notdir $@)" ${Q}if ! $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/xlat/ -r "$@" -i "$<" -xx -O xlat_only > "$@.log" 2>&1 || ! test -f "$@"; then \ cat $@.log; \ echo "./$(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/xlat/ -r \"$@\" -i \"$<\" -xx -O xlat_only"; \