summaryrefslogtreecommitdiff
path: root/selftest/target
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-03 15:14:31 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-07 13:22:00 +1100
commit6484da4859fe9b00a7129d89e185bb7947621243 (patch)
treee62e382fb2288d1dd3e0c352c94a215a2cdefc45 /selftest/target
parente7b2e06130fd74a539c58a48c870c9fa1961f699 (diff)
downloadsamba-6484da4859fe9b00a7129d89e185bb7947621243.tar.gz
samba-6484da4859fe9b00a7129d89e185bb7947621243.tar.bz2
samba-6484da4859fe9b00a7129d89e185bb7947621243.zip
s4-test: allow make test to work from top level directory
this fixes the path assumptions in Samba4 make test to allow it to work from the top level directory. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/target')
-rw-r--r--selftest/target/Samba4.pm19
1 files changed, 12 insertions, 7 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 20c1a1babc..a6e2ece705 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -12,13 +12,13 @@ use POSIX;
use SocketWrapper;
sub new($$$$$) {
- my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_;
+ my ($classname, $bindir, $ldap, $srcdir, $exeext) = @_;
$exeext = "" unless defined($exeext);
my $self = {
vars => {},
ldap => $ldap,
bindir => $bindir,
- setupdir => $setupdir,
+ srcdir => $srcdir,
exeext => $exeext
};
bless $self;
@@ -34,6 +34,11 @@ sub bindir_path($$) {
return $path;
}
+sub scriptdir_path($$) {
+ my ($self, $path) = @_;
+ return "$self->{srcdir}/source4/scripting/$path";
+}
+
sub openldap_start($$$) {
}
@@ -548,7 +553,7 @@ sub provision_raw_prepare($$$$$$$$$$)
if (defined($ENV{PYTHON})) {
push (@provision_options, $ENV{PYTHON});
}
- push (@provision_options, "$self->{setupdir}/provision");
+ push (@provision_options, "$self->{srcdir}/source4/setup/provision");
push (@provision_options, "--configfile=$ctx->{smb_conf}");
push (@provision_options, "--host-name=$ctx->{netbiosname}");
push (@provision_options, "--host-ip=$ctx->{ipv4}");
@@ -591,7 +596,7 @@ sub provision_raw_step1($$)
pid directory = $ctx->{piddir}
ncalrpc dir = $ctx->{ncalrpcdir}
lock dir = $ctx->{lockdir}
- setup directory = $self->{setupdir}
+ setup directory = $self->{srcdir}/source4/setup
winbindd socket directory = $ctx->{winbindd_socket_dir}
winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
@@ -610,8 +615,8 @@ sub provision_raw_step1($$)
log level = $ctx->{server_loglevel}
lanman auth = Yes
rndc command = true
- dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file}
- spn update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_spnupdate
+ dns update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file}
+ spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate
resolv:host file = $ctx->{dns_host_file}
dreplsrv:periodic_startup_interval = 0
";
@@ -697,7 +702,7 @@ nogroup:x:65534:nobody
my $configuration = "--configfile=$ctx->{smb_conf}";
#Ensure the config file is valid before we start
- my $testparm = $self->bindir_path("../scripting/bin/testparm");
+ my $testparm = $self->scriptdir_path("bin/testparm");
if (system("$testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) {
system("$testparm -v --suppress-prompt $configuration >&2");
warn("Failed to create a valid smb.conf configuration $testparm!");