Fix build with DISABLE_EVENT (proper spelling)

[exim.git] / test / patchexim

diff --git a/test/patchexim b/test/patchexim
index cb9f98825102d06cee8eba8b69e886bc1ed2af78..a006022e0453bc73d93e916c1b204f16405d5dae 100755 (executable)
--- a/test/patchexim
+++ b/test/patchexim
@@ -2,6 +2,7 @@
 
 use strict;
 use warnings;
 
 use strict;
 use warnings;

+use Getopt::Std;

 
 ###############################################################################
 # This is an auxiliary script that is part of the Exim test suite. It must be #
 
 ###############################################################################
 # This is an auxiliary script that is part of the Exim test suite. It must be #


@@ -11,16 +12,24 @@ use warnings;
 #                                                                             #
 # The only argument to this script is the name of the Exim binary that is to  #
 # be copied. The script must be run in the correct current directory.         #
 #                                                                             #
 # The only argument to this script is the name of the Exim binary that is to  #
 # be copied. The script must be run in the correct current directory.         #

+#                                                                            #
+# One option, -o <outfile> can be given.  Default is "eximdir/exim"           #

 ###############################################################################
 
 ###############################################################################
 

+our ($opt_o);
+getopts('o:');
+
+my $outfile = defined($opt_o) ? $opt_o : 'eximdir/exim';
+

 open(IN, $ARGV[0]) || die "** Failed to open $ARGV[0]: $!\n";
 open(IN, $ARGV[0]) || die "** Failed to open $ARGV[0]: $!\n";

-open(OUT, '>eximdir/exim') || die "** Failed to open eximdir/exim: $!\n";
+open(OUT, ">$outfile") || die "** Failed to open $outfile: $!\n";

 
 while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;
   s{
 
 while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;
   s{

-    (\d+\.\d+                         # major.minor
+    (\d+[_.]\d+                       # major.minor
+    (?:[_.]\d+)?                      # optional security-patchlevel

     (?:[_.]\d+)?                      # optional patchlevel
     (?:[_-]RC\d+|[_-]?dev(?:start)?)? # optional RC or dev(start)
     (?:(?:[_-]\d+)?                   # git tag distance
     (?:[_.]\d+)?                      # optional patchlevel
     (?:[_-]RC\d+|[_-]?dev(?:start)?)? # optional RC or dev(start)
     (?:(?:[_-]\d+)?                   # git tag distance


@@ -36,6 +45,6 @@ while(<IN>)
 close(IN);
 close(OUT);
 
 close(IN);
 close(OUT);
 

-chmod 04755, 'eximdir/exim';
+chmod 04755, $outfile;

 
 # End of patchexim script
 
 # End of patchexim script