From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 9 Dec 2020 14:46:31 +0000 (-0500)
Subject: move "sort" call to TEST_BOOTSTRAP
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23ddb4040c0a12535e49ea068cb21110393f5066;p=thirdparty%2Ffreeradius-server.git

move "sort" call to TEST_BOOTSTRAP

so we have deterministic builds everywhere
---

diff --git a/src/tests/all.mk b/src/tests/all.mk
index e47cb461f2d..74f05de8b08 100644
--- a/src/tests/all.mk
+++ b/src/tests/all.mk
@@ -114,7 +114,7 @@ $$(OUTPUT.$(TEST)):
 #
 #  All of the output files depend on the input files
 #
-FILES.$(TEST) := $(addprefix $$(OUTPUT.$(TEST))/,$(FILES))
+FILES.$(TEST) := $(addprefix $$(OUTPUT.$(TEST))/,$(sort $(FILES)))
 
 #
 #  The output files also depend on the directory
diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 1ca4c09bad8..8b1b7e4658e 100644
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -13,7 +13,7 @@ TEST := test.keywords
 #  The list is unordered.  The order is added in the next step by looking
 #  at precursors.
 #
-FILES := $(sort $(filter-out %.conf %.md %.attrs %.mk %~ %.rej,$(subst $(DIR)/,,$(wildcard $(DIR)/*))))
+FILES := $(filter-out %.conf %.md %.attrs %.mk %~ %.rej,$(subst $(DIR)/,,$(wildcard $(DIR)/*)))
 
 #
 #  Don't run SSHA tests if there's no SSL
diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index 0b90fd900aa..7b9bbea65c8 100644
--- a/src/tests/modules/all.mk
+++ b/src/tests/modules/all.mk
@@ -8,7 +8,7 @@ TEST := test.modules
 #  The list is unordered.  The order is added in the next step by looking
 #  at precursors.
 #
-FILES := $(sort $(patsubst $(DIR)/%.unlang,%,$(call FIND_FILES_SUFFIX,$(DIR),*.unlang)))
+FILES := $(patsubst $(DIR)/%.unlang,%,$(call FIND_FILES_SUFFIX,$(DIR),*.unlang))
 
 #
 #  Remove things which are known to fail in CI.