diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-02 12:43:20 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-02 13:12:30 +0100 |
| commit | 016598717b60c9c8731739789a394ddaecdb90eb (patch) | |
| tree | d723961feeac56f653b180d6ea1a82e59a16008e /selftest | |
| parent | bab629426958907e675765ce0620f321dcc5f780 (diff) | |
| download | samba-016598717b60c9c8731739789a394ddaecdb90eb.tar.gz samba-016598717b60c9c8731739789a394ddaecdb90eb.tar.xz samba-016598717b60c9c8731739789a394ddaecdb90eb.zip | |
selftest: remove source4 specific stuff from selftest.pl
metze
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/selftest.pl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index d4fd57e4946..f6561cc8c70 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -365,7 +365,8 @@ unless (defined($ENV{VALGRIND})) { $ENV{MALLOC_CHECK_} = 2; } -my $old_pwd = "$RealBin/.."; +my $bindir = ($opt_bindir or "$builddir/bin"); +my $bindir_abs = abs_path($bindir); # Backwards compatibility: if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") { @@ -410,8 +411,8 @@ if (defined($ENV{RUN_FROM_BUILD_FARM}) and my $tls_enabled = not $opt_quick; $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no"); -$ENV{LDB_MODULES_PATH} = "$old_pwd/source4/bin/modules/ldb"; -$ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/source4/bin/modules"; +$ENV{LDB_MODULES_PATH} = "$bindir_abs/modules/ldb"; +$ENV{LD_SAMBA_MODULE_PATH} = "$bindir_abs/modules"; sub prefix_pathvar($$) { my ($name, $newpath) = @_; @@ -421,8 +422,8 @@ sub prefix_pathvar($$) $ENV{$name} = $newpath; } } -prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/source4/bin/pkgconfig"); -prefix_pathvar("PYTHONPATH", "$old_pwd/source4/bin/python"); +prefix_pathvar("PKG_CONFIG_PATH", "$bindir_abs/pkgconfig"); +prefix_pathvar("PYTHONPATH", "$bindir_abs/python"); if ($opt_socket_wrapper_keep_pcap) { # Socket wrapper keep pcap implies socket wrapper pcap @@ -450,10 +451,8 @@ my $testenv_default = "none"; if ($opt_target eq "samba4") { $testenv_default = "member"; require target::Samba4; - $target = new Samba4($opt_bindir or "$builddir/bin", - $ldap, "$srcdir/setup", $exeext); + $target = new Samba4($bindir, $ldap, "$srcdir/setup", $exeext); } elsif ($opt_target eq "samba3") { - my $bindir = ($opt_bindir or "$builddir/bin"); if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") { die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting...."); } |