From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 16 Feb 2021 15:15:55 +0000 (+0000)
Subject: Only set TEST_SERVER variables for feature tests (#3938)
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89b77dc09571cb4ac3cd4d639aee6c17bea23182;p=thirdparty%2Ffreeradius-server.git

Only set TEST_SERVER variables for feature tests (#3938)

Prevents builds without the feature test servers from attempting to test
against servers that don't exist.
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3db38b5de6..b5a5171f4b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,17 +12,6 @@ env:
   KQUEUE_DEBUG: yes
   M_PERTURB: "0x42"
   PANIC_ACTION: "gdb -batch -x raddb/panic.gdb %e %p 1>&0 2>&0"
-  SMTP_TEST_SERVER: 127.0.0.1
-  SMTP_TEST_SERVER_PORT: 2525
-  IMAP_TEST_SERVER: 127.0.0.1
-  IMAP_TEST_SERVER_PORT: 1430
-  IMAP_TEST_SERVER_SSL_PORT: 1431
-  SQL_MYSQL_TEST_SERVER: 127.0.0.1
-  SQL_POSTGRESQL_TEST_SERVER: 127.0.0.1
-  LDAP_TEST_SERVER: 127.0.0.1
-  LDAP_TEST_SERVER_PORT: 3890
-#  REDIS_TEST_SERVER: 127.0.0.1
-#  REDIS_IPPOOL_TEST_SERVER: 127.0.0.1
   ANALYZE_C_DUMP: 1
   FR_GLOBAL_POOL: 4M
   TEST_CERTS: yes
@@ -319,6 +308,18 @@ jobs:
             $script
         done
         make ci-test
+      env:
+        SMTP_TEST_SERVER: 127.0.0.1
+        SMTP_TEST_SERVER_PORT: 2525
+        IMAP_TEST_SERVER: 127.0.0.1
+        IMAP_TEST_SERVER_PORT: 1430
+        IMAP_TEST_SERVER_SSL_PORT: 1431
+        SQL_MYSQL_TEST_SERVER: 127.0.0.1
+        SQL_POSTGRESQL_TEST_SERVER: 127.0.0.1
+        LDAP_TEST_SERVER: 127.0.0.1
+        LDAP_TEST_SERVER_PORT: 3890
+#       REDIS_TEST_SERVER: 127.0.0.1
+#       REDIS_IPPOOL_TEST_SERVER: 127.0.0.1
 
     # Includes hack to disable trunk tests on MacOS which are currently broken
     # Also, no detect_leaks support for ASAN