X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cccb2c06bbb96fa98edf6867f0eba4059aa757a0..ee549a2ed04164407f4f897be3bf545f32579c5c:/test/runtest diff --git a/test/runtest b/test/runtest index dcf6d76b2..846ce2cf7 100755 --- a/test/runtest +++ b/test/runtest @@ -1475,7 +1475,6 @@ RESET_AFTER_EXTRA_LINE_READ: } # Different builds will have different lookup types included - s/required_quoter_id \K\d+ \((\w+)\) quoting -1 \(NULL\)$/NN ($1) quoting -1 (NULL)/; # and different numbers of lookup types result in different type-code letters, # so convert them all to "0" s%(?; ; ; ; ; next; } + # various features can be built as dynamic-load modules + next if /loading module '(?:arc|exim_filter|dkim|dmarc|pam|perl|radius|sieve_filter|spf)'$/; + # Not all platforms build with DKIM enabled next if /^DKIM >> Body data for hash, canonicalized/; + # Not all platforms build with SOCKS enabled + next if /^try option socks_proxy$/; + # Not all platforms build with SPF enabled next if /(^$time_pid?spf_conn_init|spf_compile\.c)/; next if /try option spf_smtp_comment_template$/; - next if /loading module 'spf'$/; - next if /^Loaded "spf"$/; + next if /^$time_pid?Loaded "(?:dkim|dmarc|exim_filter|spf)"$/; # Not all platforms have sendfile support next if /^cannot use sendfile for body: no support$/; @@ -1625,6 +1629,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/ \[\d+\] (?=(LOG: redirecting log|HINT: Future log output))/ [pppp] /; # Not all builds include DMARC + next if /try option dmarc_tld_file$/; next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ; # Platform differences in errno strings @@ -4148,7 +4153,6 @@ system("sudo cp eximdir/exim eximdir/exim_exim;" . "sudo chmod 06755 eximdir/exim_exim"); # Copy any libraries that were built for dynamic load -# Currently this is only for lookup methods ($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?; @@ -4430,6 +4434,9 @@ foreach $basedir ("aux-var", "dnszones") $" = ' '; } + my $testnum = 0; + if ($file =~ /^(\d+)/) { $testnum = $1; } + print ">>Copying $basedir-src/$file to $basedir/$outfile\n" if $debug; open(IN, "$parm_cwd/$basedir-src/$file") || tests_exit(-1, "Failed to open $parm_cwd/$basedir-src/$file: $!"); @@ -4437,7 +4444,7 @@ foreach $basedir ("aux-var", "dnszones") tests_exit(-1, "Failed to open $parm_cwd/$basedir/$outfile: $!"); while () { - do_substitute(0); + do_substitute($testnum); print OUT; } close(IN);