summaryrefslogtreecommitdiff
path: root/selftest/target
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-22 11:56:18 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-22 16:20:10 +1100
commit6c1ce36ec97525774aaba294f48fbd6fab15a80e (patch)
tree0767e72ea3ad1e68cb97a39705e15a1e35aaee46 /selftest/target
parentb73cfabdf5cc28a91a72df8b64cf57021e08f0b0 (diff)
downloadsamba-6c1ce36ec97525774aaba294f48fbd6fab15a80e.tar.gz
samba-6c1ce36ec97525774aaba294f48fbd6fab15a80e.tar.bz2
samba-6c1ce36ec97525774aaba294f48fbd6fab15a80e.zip
selftest pass in srcdir into Samba3 target module
Diffstat (limited to 'selftest/target')
-rw-r--r--selftest/target/Samba3.pm12
1 files changed, 7 insertions, 5 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 4d60a52002..b46a2df8d7 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -24,8 +24,10 @@ sub binpath($$)
}
sub new($$) {
- my ($classname, $bindir) = @_;
- my $self = { bindir => $bindir };
+ my ($classname, $bindir, $srcdir) = @_;
+ my $self = { bindir => $bindir,
+ srcdir => $srcdir
+ };
bless $self;
return $self;
}
@@ -475,11 +477,11 @@ sub provision($$$$$$)
my $conffile="$libdir/server.conf";
- my $nss_wrapper_pl = "$ENV{PERL} $RealBin/../lib/nss_wrapper/nss_wrapper.pl";
+ my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl";
my $nss_wrapper_passwd = "$privatedir/passwd";
my $nss_wrapper_group = "$privatedir/group";
- my $mod_printer_pl = "$ENV{PERL} $RealBin/../source3/script/tests/printing/modprinter.pl";
+ my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl";
my @eventlog_list = ("dns server", "application");
@@ -521,7 +523,7 @@ sub provision($$$$$$)
netbios name = $server
interfaces = $server_ip/8
bind interfaces only = yes
- panic action = $RealBin/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+ panic action = $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
workgroup = $domain