summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-19 07:39:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:07 -0500
commit1711fed0dd7ab34b0c6029364019a51695c84174 (patch)
tree99107631a950302cb08ff7b76d6d7bf1036f9a70
parenta0bfcfa55d9f00ffab59e8cf7529cadf108a5629 (diff)
downloadsamba-1711fed0dd7ab34b0c6029364019a51695c84174.tar.gz
samba-1711fed0dd7ab34b0c6029364019a51695c84174.tar.bz2
samba-1711fed0dd7ab34b0c6029364019a51695c84174.zip
r22359: try to fix the start failures in the build-farm by creating the prefix dir
before using abs_path() metze (This used to be commit a3f35f5af4533d7903c2a1e181017b310baa9d71)
-rwxr-xr-xsource4/script/tests/selftest.pl9
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 747f0d100a..0a41276881 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -444,19 +444,20 @@ $prefix =~ s+//+/+;
$prefix =~ s+/./+/+;
$prefix =~ s+/$++;
+die("using an empty prefix isn't allowed") unless $prefix ne "";
+
+#Ensure we have the test prefix around
+mkdir $prefix unless -d $prefix;
+
my $prefix_abs = abs_path($prefix);
my $srcdir_abs = abs_path($srcdir);
-die("using an empty prefix isn't allowed") unless $prefix ne "";
die("using an empty absolute prefix isn't allowed") unless $prefix_abs ne "";
die("using '/' as absolute prefix isn't allowed") unless $prefix_abs ne "/";
$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"));