Update version, test range.

[buildfarm-client.git] / build-farm.conf.template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 8255bb34ffeb08f7fb54e079a813d045256525f9..30134a708001bc3c859f2bc8ddcf2af90211ea14 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -28,14 +28,6 @@ my $branch;
     scm => 'git',
     # default is github mirror of Exim
     scmrepo => 'https://github.com/Exim/exim.git',
-    # Wishlist for future, track and build from multiple repos.
-    # Doesn't do anything yet.
-    repos => {
-      'exim' => 'git://www.mrball.net/exim/exim.git',
-      'exim.jgh' => 'git://www.mrball.net/exim/exim-jgh.git',
-      'exim.pdp' => 'git://www.mrball.net/exim/exim-pdp.git',
-      'exim.tlyons' => 'git://www.mrball.net/exim/exim-tlyons.git',
-    },
     # webref for diffs on server - use default for community
     scm_url => undef,
     # for --reference on git repo
@@ -133,9 +125,18 @@ my $branch;
     makefile_set =>{
         # comment out if not using ccache
         CC => 'ccache gcc',
+        # Required for some tests to pass
+        AUTH_PLAINTEXT => 'yes',
+        SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.
         #SUPPORT_TLS => 'yes',
+        #USE_OPENSSL_PC => 'openssl',
         #TLS_LIBS => '-lssl -lcrypto',
+        #EXPERIMENTAL_SPF => 'yes',
+        #LOOKUP_LDAP => 'yes',
+        #LOOKUP_INCLUDE => '-I/usr/include/mysql',
+        #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
+        #LDAP_LIB_TYPE => 'OPENLDAP2',
     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:
@@ -146,12 +147,25 @@ my $branch;
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
+        # If set EXPERIMENTAL_SPF above, add it to the linker:
+        #LDFLAGS => '-lspf2',
     },
 
     # Another way to enable things in the Local/Makefile.
     # Use a simple regex to change a default to what you want.
     makefile_regex =>[
-        #q(s/^# EXPERIMENTAL_PRDR.*/EXPERIMENTAL_PRDR=yes/),
+        # 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
+        #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.
@@ -163,9 +177,9 @@ my $branch;
 
     # Range of tests to run if enable make_test in optional steps.
     #range_num_tests => '1 999',
-    range_num_tests => '1 999',
+    range_num_tests => '1 5999',
     # Hardcode some valid version for use during make test
-    exim_test_version => '4.80',
+    exim_test_version => '4.84',
 
     optional_steps =>{
         # which optional steps to run and when to run them
@@ -181,28 +195,6 @@ my $branch;
         qw()
     ],
 
-    # per-branch contents of extra config for check stages.
-    # each branch has an array of setting lines (no \n required)
-    # a DEFAULT entry is used for all branches, before any
-    # branch-specific settings.
-    extra_config =>{
-        DEFAULT => [
-            #q(log_line_prefix = '[%c:%l] '),
-            #"log_connections = 'true'",
-            #"log_disconnections = 'true'",
-            #"log_statement = 'all'",
-            #"fsync = off"
-        ],
-    },
-
-    # Unused
-    # port number actually used will be based on this param and the branch,
-    # so we ensure they don't collide
-    base_port => 5678,
-
-    # Unused
-    modules => [qw(TestUpgrade)],
-
 );
 
 if ($branch eq 'global')