summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-28 09:35:44 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-28 10:07:12 +0100
commitdb7ee3733fbca937612247ad5d821121b4792112 (patch)
tree3f7007e95a2d40fad457bada93e9ed2de5d0dfcd /selftest
parent11b66ccaa10d260a00a4992ce3f9bb2861af953d (diff)
downloadsamba-db7ee3733fbca937612247ad5d821121b4792112.tar.gz
samba-db7ee3733fbca937612247ad5d821121b4792112.tar.bz2
samba-db7ee3733fbca937612247ad5d821121b4792112.zip
s3: try to make 'make selftest' work again
metze
Diffstat (limited to 'selftest')
-rw-r--r--selftest/target/Samba3.pm40
1 files changed, 20 insertions, 20 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index eb6db1a407..7c3c0b0ea9 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -179,26 +179,26 @@ sub check_or_start($$$$) {
write_pid($env_vars, "nmbd", $pid);
print "DONE\n";
-# disable winbindd until the build-farm faked_users work with it
-# unlink($env_vars->{WINBINDD_TEST_LOG});
-# print "STARTING WINBINDD...";
-# $pid = fork();
-# if ($pid == 0) {
-# open STDOUT, ">$env_vars->{WINBINDD_TEST_LOG}";
-# open STDERR, '>&STDOUT';
-#
-# $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
-#
-# my @optargs = ("-d0");
-# if (defined($ENV{WINBINDD_OPTIONS})) {
-# @optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
-# }
-#
-# $ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
-# exec($self->binpath("timelimit"), $winbindd_maxtime, $ENV{WINBINDD_VALGRIND}, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
-# }
-# write_pid($env_vars, "winbindd", $pid);
-# print "DONE\n";
+ unlink($env_vars->{WINBINDD_TEST_LOG});
+ print "STARTING WINBINDD...";
+ $pid = fork();
+ if ($pid == 0) {
+ open STDOUT, ">$env_vars->{WINBINDD_TEST_LOG}";
+ open STDERR, '>&STDOUT';
+
+ $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+
+ my @optargs = ("-d0");
+ if (defined($ENV{WINBINDD_OPTIONS})) {
+ @optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
+ }
+
+ $ENV{$ENV{LIB_PATH_VAR}} = $self->{bindir};
+ $ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
+ exec($self->binpath("timelimit"), $winbindd_maxtime, $ENV{WINBINDD_VALGRIND}, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
+ }
+ write_pid($env_vars, "winbindd", $pid);
+ print "DONE\n";
unlink($env_vars->{SMBD_TEST_LOG});
print "STARTING SMBD...";