Testsuite: 4509 independent of calling user

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index fb1cfc762043c2918cf0190e374ee66649e924c8..a0d7fd14b92e249f7a0dd1c0c114ebbbb7779a26 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -46,10 +46,13 @@ $testversion = "4.80 (08-May-12)";
 # normal = 2432   tls_dh_max_bits = 2236
 $gnutls_dh_bits_normal = 2236;
 
 # normal = 2432   tls_dh_max_bits = 2236
 $gnutls_dh_bits_normal = 2236;
 

-$cf = "bin/cf -exact";
+$cf = 'bin/cf -exact';

 $cr = "\r";
 $debug = 0;
 $cr = "\r";
 $debug = 0;

-$flavour = 'FOO';
+$flavour = do {
+  my $f = Exim::Runtest::flavour();
+  (grep { $f eq $_ } Exim::Runtest::flavours()) ? $f : 'FOO';
+};

 $force_continue = 0;
 $force_update = 0;
 $log_failed_filename = "failed-summary.log";
 $force_continue = 0;
 $force_update = 0;
 $log_failed_filename = "failed-summary.log";


@@ -1719,14 +1722,9 @@ return $yield;
 # Returns:  nothing
 
 sub run_system {
 # Returns:  nothing
 
 sub run_system {

-my($cmd) = $_[0];
-if ($debug)
-  {
-  my($prcmd) = $cmd;
-  $prcmd =~ s/; /;\n>> /;
-  print ">> $prcmd\n";
-  }
-system("$cmd");
+  my $cmd = shift;
+  print '>> ' . $cmd =~ s/; /;\n>>/r . "\n" if $debug;
+  system $cmd;

 }
 
 
 }
 
 


@@ -2253,7 +2251,7 @@ elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+
     {
     $pidfile = "$parm_cwd/spool/exim-daemon.pid";
     if ($debug) { printf ">> daemon: $cmd\n"; }
     {
     $pidfile = "$parm_cwd/spool/exim-daemon.pid";
     if ($debug) { printf ">> daemon: $cmd\n"; }

-    run_system("sudo mkdir spool/log 2>/dev/null");
+    run_system('sudo mkdir spool/log 2>/dev/null');

     run_system("sudo chown $parm_eximuser:$parm_eximgroup spool/log");
 
     # Before running the command, convert the -bd option into -bdf so that an
     run_system("sudo chown $parm_eximuser:$parm_eximgroup spool/log");
 
     # Before running the command, convert the -bd option into -bdf so that an


@@ -2289,7 +2287,7 @@ elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+
 
     my $listen_port = $1;
     if ($debug) { printf ">> wait-mode daemon: $cmd\n"; }
 
     my $listen_port = $1;
     if ($debug) { printf ">> wait-mode daemon: $cmd\n"; }

-    run_system("sudo mkdir spool/log 2>/dev/null");
+    run_system('sudo mkdir spool/log 2>/dev/null');

     run_system("sudo chown $parm_eximuser:$parm_eximgroup spool/log");
 
     my $pid = fork();
     run_system("sudo chown $parm_eximuser:$parm_eximgroup spool/log");
 
     my $pid = fork();


@@ -3182,13 +3180,9 @@ if ($parm_hostname =~ /[[:upper:]]/)
 # that was done above. Furthermore, we ensure that the binary is deleted at the
 # end of the test. First ensure the directory exists.
 
 # that was done above. Furthermore, we ensure that the binary is deleted at the
 # end of the test. First ensure the directory exists.
 

-if (-d "eximdir")
-  { unlink "eximdir/exim"; }     # Just in case
-else
-  {
-  mkdir("eximdir", 0710) || die "** Unable to mkdir $parm_cwd/eximdir: $!\n";
-  system("sudo chgrp $parm_eximgroup eximdir");
-  }
+unlink 'eximdir/exim';  # Just in case
+-d 'eximdir' or mkdir('eximdir', 0710) or die "** Unable to mkdir $parm_cwd/eximdir: $!\n";
+system("sudo chgrp $parm_eximgroup eximdir");

 
 # The construction of the patched binary must be done as root, so we use
 # a separate script. As well as indicating that this is a test-harness binary,
 
 # The construction of the patched binary must be done as root, so we use
 # a separate script. As well as indicating that this is a test-harness binary,


@@ -3203,16 +3197,16 @@ die "** Unable to make patched exim: $!\n"
 # tests_exit(), so that suitable cleaning up can be done when required.
 # Arrange to catch interrupting signals, to assist with this.
 
 # tests_exit(), so that suitable cleaning up can be done when required.
 # Arrange to catch interrupting signals, to assist with this.
 

-$SIG{'INT'} = \&inthandler;
-$SIG{'PIPE'} = \&pipehandler;
+$SIG{INT} = \&inthandler;
+$SIG{PIPE} = \&pipehandler;

 
 # For some tests, we need another copy of the binary that is setuid exim rather
 # than root.
 
 
 # For some tests, we need another copy of the binary that is setuid exim rather
 # than root.
 

-system("sudo cp eximdir/exim eximdir/exim_exim;" .
+system('sudo cp eximdir/exim eximdir/exim_exim;' .

        "sudo chown $parm_eximuser eximdir/exim_exim;" .
        "sudo chgrp $parm_eximgroup eximdir/exim_exim;" .
        "sudo chown $parm_eximuser eximdir/exim_exim;" .
        "sudo chgrp $parm_eximgroup eximdir/exim_exim;" .

-       "sudo chmod 06755 eximdir/exim_exim");
+       'sudo chmod 06755 eximdir/exim_exim');

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