Merge branch 'master' of git://git.samba.org/samba

1 files changed, 13 insertions, 0 deletions

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 3536d410ae..883d2a0d46 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -212,6 +212,17 @@ sub cleanup_pcap($$)
 	unlink($pcap_file);
 }
 
+# expand strings from %ENV
+sub expand_environment_strings($)
+{
+	my $s = shift;
+	# we use a reverse sort so we do the longer ones first
+	foreach my $k (sort { $b cmp $a } keys %ENV) {
+		$s =~ s/\$$k/$ENV{$k}/g;
+	}
+	return $s;
+}
+
 sub run_testsuite($$$$$)
 {
 	my ($envname, $name, $cmd, $i, $totalsuites) = @_;
@@ -255,6 +266,7 @@ sub run_testsuite($$$$$)
 	}
 
 	print "command: $cmd\n";
+	printf "expanded command: %s\n", expand_environment_strings($cmd);
 
 	my $exitcode = $ret >> 8;
 
@@ -587,6 +599,7 @@ sub write_clientconf($$)
 #We don't want to pass our self-tests if the PAC code is wrong
 	gensec:require_pac = true
 	modules dir = $ENV{LD_SAMBA_MODULE_PATH}
+	setup directory = ./setup
 ";
 	close(CF);
 }