setenv support added to allow test cases to require a set of environment

variables

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 356b0c0c05134f25d15b24223e9817c1b5b63e29..2fd90648745cd1c8846ba039d44bed0ccfb993b1 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -66,6 +66,14 @@ in the libtest/ directory.
 test case description
 </name>
 
+<setenv>
+variable1=contents1
+variable2=contents2
+
+Set the given environment variables to the specified value before the actual
+command is run, they are clear again after the command has been run.
+</setenv>
+
 <command [option=no-output]>
 command line to run, there's a bunch of %variables that get replaced
 accordingly. more about them elsewhere

diff --git a/tests/runtests.pl b/tests/runtests.pl
index ed1a619e57dee3c4f24d70360362a24f9ac55d23..c8bec0ba6b763ca4ddba5670d6f021dab6af3afb 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -611,6 +611,29 @@ sub singletest {
         writearray($FTPDCMD, \@ftpservercmd);
     }
 
+    my (@setenv)= getpart("client", "setenv");
+    my @envs;
+
+    my $s;
+    for $s (@setenv) {
+        chomp $s; # cut off the newline
+
+        subVariables \$s;
+
+        print "MOO: $s\n";
+        
+        if($s =~ /([^=]*)=(.*)/) {
+            my ($var, $content)=($1, $2);
+            
+            $ENV{$var}=$content;
+
+            print "setenv $var to $content\n";
+
+            # remember which, so that we can clear them afterwards!
+            push @envs, $var;
+        }
+    }
+
     # get the command line options to use
     my ($cmd, @blaha)= getpart("client", "command");
 
@@ -720,6 +743,11 @@ sub singletest {
     # remove the special FTP command file after each test!
     unlink($FTPDCMD);
 
+    my $e;
+    for $e (@envs) {
+        $ENV{$e}=""; # clean up
+    }
+
     my @err = getpart("verify", "errorcode");
     my $errorcode = $err[0];