Perform xlat instantiation in the right order in unit_test_module.c

src/main/unit_test_module.c

@@ -850,11 +850,6 @@ int main(int argc, char *argv[])
 	 */
 	if (modules_instantiate(main_config.config) < 0) goto exit_failure;
 
-	/*
-	 *	Call xlat instantiation functions.
-	 */
-	if (xlat_instantiate() < 0) exit(EXIT_FAILURE);
-
 	/*
 	 *	Create a dummy event list
 	 */
@@ -865,13 +860,18 @@ int main(int argc, char *argv[])
 	 *	Perform any thread specific instantiation
 	 */
 	if (modules_thread_instantiate(main_config.config, el) < 0) goto exit_failure;
-	if (xlat_thread_instantiate() < 0) goto exit_failure;
 
 	/*
 	 *	And then load the virtual servers.
 	 */
 	if (virtual_servers_instantiate() < 0) goto exit_failure;
 
+	/*
+	 *	Call xlat instantiation functions (after the xlats have been compiled)
+	 */
+	if (xlat_instantiate() < 0) exit(EXIT_FAILURE);
+	if (xlat_thread_instantiate() < 0) goto exit_failure;
+
 	state = fr_state_tree_init(NULL, main_config.max_requests * 2, 10);
 
 	/*