s3: try to make 'make selftest' work again

metze

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index eb6db1a4074acdfa3995e33e4a2677302d98eb16..7c3c0b0ea993b526b9168356809ffc354eb428db 100644 (file)
--- 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...";

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 947fdc9f28603e6459f483064359788815a5c65e..607044fd832cac03dd93d7de1212ffc1753cc51f 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2951,12 +2951,15 @@ valgrindtest:: all torture timelimit
 SELFTEST_FORMAT = plain
 selftestdir = ../selftest
 
+S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin"
+
 selftest:: all torture timelimit
-       @$(selftestdir)/selftest.pl --prefix=st --target=samba3 \
+       @$(S3_LD_LIBPATH_OVERRIDE) $(selftestdir)/selftest.pl \
+               --prefix=${selftest_prefix} --target=samba3 \
                --testlist="$(srcdir)/selftest/tests.sh|" \
                --expected-failures=$(srcdir)/selftest/knownfail \
                --exclude=$(srcdir)/selftest/skip \
-               --socket-wrapper $(TESTS) --format=$(SELFTEST_FORMAT)
+               --socket-wrapper $(TESTS) --format=$(SELFTEST_FORMAT) --immediate
 
 selftest-%:
        $(MAKE) selftest TESTS=$*

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 49afa3a2e25a13e43e30f22dee23764e27fdc093..715961e4de545c09a82b4539826a8e3c8fc53e54 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -170,9 +170,9 @@ everything:: $(patsubst %,%4,$(BINARIES))
 setup:
        @ln -sf ../source4/setup setup
 
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
+S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
 
-SELFTEST4 = $(LD_LIBPATH_OVERRIDE) EXEEXT="4" $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \
+SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \
     --builddir=$(builddir) --srcdir=$(samba4srcdir) \
     --exeext=4 \
     --expected-failures=$(samba4srcdir)/selftest/knownfail \