diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-04-11 03:45:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:55 -0500 |
| commit | 7b88696bed9dac1a40e31f360a8781910636455a (patch) | |
| tree | e33928f9bc2eb2f682ef6b65b6792793912b88cc /source4/script/tests/selftest.pl | |
| parent | dbfb32ffe5925259994712c9b1f18c4b60b9cdee (diff) | |
| download | samba-7b88696bed9dac1a40e31f360a8781910636455a.tar.gz samba-7b88696bed9dac1a40e31f360a8781910636455a.tar.bz2 samba-7b88696bed9dac1a40e31f360a8781910636455a.zip | |
r22161: Clarify exactly where the socket_wrapper should be handled (early),
and ensure that $prefix exists before it tries to create $prefix/w.
This should fix the build farm. Perhaps we should have a rm -rf
$prefix at the start of this script, as that would have found the
problem, but I want to be careful about that...
Andrew Bartlett
(This used to be commit a230261e83fd9161e60554b74cf8556f36b1af45)
Diffstat (limited to 'source4/script/tests/selftest.pl')
| -rwxr-xr-x | source4/script/tests/selftest.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl index e6ca48bafb..6886f8231e 100755 --- a/source4/script/tests/selftest.pl +++ b/source4/script/tests/selftest.pl @@ -371,6 +371,9 @@ $prefix =~ s+//+/+; $ENV{PREFIX} = $prefix; $ENV{SRCDIR} = $srcdir; +#Ensure we have the test prefix around +mkdir $prefix unless -d $prefix; + my $tls_enabled = not $opt_quick; my $from_build_farm = (defined($ENV{RUN_FROM_BUILD_FARM}) and ($ENV{RUN_FROM_BUILD_FARM} eq "yes")); @@ -543,7 +546,7 @@ sub setup_env($) } elsif ($envname eq "none") { $testenv_vars = {}; } else { - $testenv_vars = $target->setup_env($envname, $prefix, $socket_wrapper_dir); + $testenv_vars = $target->setup_env($envname, $prefix); } write_clientconf($conffile, $testenv_vars); foreach ("PASSWORD", "DOMAIN", "SERVER", "USERNAME", "NETBIOSNAME", |