From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 23 Mar 2023 17:23:57 +0000 (-0400)
Subject: $(Q) -> ${Q}
X-Git-Tag: release_3_2_3~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc6f6050253859f49ef052f9c28db4997f9604b2;p=thirdparty%2Ffreeradius-server.git

$(Q) -> ${Q}
---

diff --git a/src/tests/sql_nas_table/all.mk b/src/tests/sql_nas_table/all.mk
index da215011ad..311e93c301 100644
--- a/src/tests/sql_nas_table/all.mk
+++ b/src/tests/sql_nas_table/all.mk
@@ -41,19 +41,19 @@ $(eval $(call RADIUSD_SERVICE,radiusd,$(OUTPUT)))
 
 .PHONY: sql_nas_table_bootstrap
 sql_nas_table_bootstrap:
-	$(Q)rm -f $(SQL_NASTABLE_DB)
-	$(Q)mkdir -p $(SQL_NASTABLE_BUILD_DIR)
-	$(Q)sqlite3 $(SQL_NASTABLE_DB) < ./raddb/mods-config/sql/main/sqlite/schema.sql
-	$(Q)sqlite3 $(SQL_NASTABLE_DB) < ./src/tests/sql_nas_table/clients.sql
+	${Q}rm -f $(SQL_NASTABLE_DB)
+	${Q}mkdir -p $(SQL_NASTABLE_BUILD_DIR)
+	${Q}sqlite3 $(SQL_NASTABLE_DB) < ./raddb/mods-config/sql/main/sqlite/schema.sql
+	${Q}sqlite3 $(SQL_NASTABLE_DB) < ./src/tests/sql_nas_table/clients.sql
 
 #
 #	Run the radclient commands against the radiusd.
 #
 $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill sql_nas_table_bootstrap $(TEST).radiusd_start
-	$(Q)echo "SQL_NASTABLE-TEST"
-	$(Q)mkdir -p $(dir $@)
-	$(Q)[ -f $(dir $@)/radiusd.pid ] || exit 1
-	$(Q)if ! $(TESTBIN)/radclient $(ARGV) -xf src/tests/sql_nas_table/auth.txt -D share/ 127.0.0.1:$(PORT) auth $(SECRET) 1> $(SQL_NASTABLE_BUILD_DIR)/radclient.log 2>&1; then \
+	${Q}echo "SQL_NASTABLE-TEST"
+	${Q}mkdir -p $(dir $@)
+	${Q}[ -f $(dir $@)/radiusd.pid ] || exit 1
+	${Q}if ! $(TESTBIN)/radclient $(ARGV) -xf src/tests/sql_nas_table/auth.txt -D share/ 127.0.0.1:$(PORT) auth $(SECRET) 1> $(SQL_NASTABLE_BUILD_DIR)/radclient.log 2>&1; then \
 		echo "FAILED";                                              \
 		rm -f $(BUILD_DIR)/tests/test.sql_nas_table;		    \
 		$(MAKE) --no-print-directory test.sql_nas_table.radiusd_kill;   \
@@ -65,10 +65,10 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill sql_nas_table_bootstrap $(TEST).rad
 		exit 1;                                                     \
 	fi
 
-	$(Q)touch $@
+	${Q}touch $@
 
 $(TEST):
-	$(Q)$(MAKE) --no-print-directory $@.radiusd_stop
+	${Q}$(MAKE) --no-print-directory $@.radiusd_stop
 	@touch $(BUILD_DIR)/tests/$@
 else
 #