Shuffle examples in config template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 1afd0fb2d05d0d6c61652742f97fd90d920daf91..c73863a3fe2b198d28aa701a409dff386f2c1e67 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -139,11 +139,16 @@ our %conf =(
         #SUPPORT_TLS => 'yes',
         #USE_OPENSSL_PC => 'openssl',
         #TLS_LIBS => '-lssl -lcrypto',
         #SUPPORT_TLS => 'yes',
         #USE_OPENSSL_PC => 'openssl',
         #TLS_LIBS => '-lssl -lcrypto',

-        #EXPERIMENTAL_SPF => 'yes',

         #LOOKUP_LDAP => 'yes',
         #LOOKUP_INCLUDE => '-I/usr/include/mysql -I/usr/include/postgresql'
         #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
         #LDAP_LIB_TYPE => 'OPENLDAP2',
         #LOOKUP_LDAP => 'yes',
         #LOOKUP_INCLUDE => '-I/usr/include/mysql -I/usr/include/postgresql'
         #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
         #LDAP_LIB_TYPE => 'OPENLDAP2',

+        #LOOKUP_MYSQL => 'yes',
+        #LOOKUP_PGSQL => 'yes',
+        #SUPPORT_PROXY => 'yes',
+        #SUPPORT_SOCKS => 'yes',
+        #EXPERIMENTAL_SPF => 'yes',
+        #EXPERIMENTAL_DANE => 'yes',

     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:
     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:


@@ -163,16 +168,9 @@ our %conf =(
     makefile_regex =>[
         # If have perl devel libraries installed, can build embedded perl
         #q(s/^# EXIM_PERL=/EXIM_PERL=/),
     makefile_regex =>[
         # If have perl devel libraries installed, can build embedded perl
         #q(s/^# EXIM_PERL=/EXIM_PERL=/),

-        # If have mysql devel libraries installed
-        #q(s/^# LOOKUP_MYSQL=/LOOKUP_MYSQL=/),
-        # If have postgres devel librarires installed
-        #q(s/^# LOOKUP_PGSQL=/LOOKUP_PGSQL=/),
-        # Severl experimental features to consider
+        # Several experimental features to consider

         #q(s/^# EXPERIMENTAL_CERTNAMES.*/EXPERIMENTAL_CERTNAMES=yes/),
         #q(s/^# EXPERIMENTAL_DNSSEC.*/EXPERIMENTAL_DNSSEC=yes/),
         #q(s/^# EXPERIMENTAL_CERTNAMES.*/EXPERIMENTAL_CERTNAMES=yes/),
         #q(s/^# EXPERIMENTAL_DNSSEC.*/EXPERIMENTAL_DNSSEC=yes/),

-        # Proxy causes some extra debug output messing with tests
-        #q(s/^# EXPERIMENTAL_PROXY.*/EXPERIMENTAL_PROXY=yes/),
-        #q(s/^# EXPERIMENTAL_TPDA.*/EXPERIMENTAL_TPDA=yes/),

     ],
 
     # The user compiled as the master exim username.
     ],
 
     # The user compiled as the master exim username.


@@ -183,8 +181,10 @@ our %conf =(
     master_exim_user => "exim",
 
     # Range of tests to run if enable make_test in optional steps.
     master_exim_user => "exim",
 
     # Range of tests to run if enable make_test in optional steps.

-    #range_num_tests => '1 999',
-    range_num_tests => '1 5999',
+    # Start with just a couple while getting the aminal set up,
+    # then enable the full set
+    range_num_tests => '1 2',
+    #range_num_tests => '1 5999',

     # Hardcode some valid version for use during make test
     exim_test_version => '4.84',
 
     # Hardcode some valid version for use during make test
     exim_test_version => '4.84',