r19358: Use subunit tests from the right location (from

$src/bin/torture when developing, $LIBDIR/torture when installed)

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 91ee7186a5d2a4441804798ba33428e90d82a9e2..e44de5c5c1be91f727742776255cb44edcf6a353 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -110,9 +110,11 @@ sub _prepare_compiler_linker($)
        my $builddir_headers = "";
 
        $self->{duplicate_build} = 0;
+       if ($self->{developer}) {
+               $self->{duplicate_build} = 1;
+       }
        if ($self->{config}->{LIBRARY_OUTPUT_TYPE} eq "SHARED_LIBRARY") {
-               if ($self->{developer}) {
-                       $self->{duplicate_build} = 1;
+               if ($self->{duplicate_build}) {
                        $devld_local = " -Wl,-rpath,\$(builddir)/bin";
                }
                $devld_install = " -Wl,-rpath-link,\$(builddir)/bin";
@@ -372,9 +374,14 @@ sub Binary($$)
                $extradir = "/torture" . substr($ctx->{INSTALLDIR}, length("TORTUREDIR"));
        }
        my $localdir = "bin$extradir";
+
+       my $dynconfig = "dynconfig.o";
+       my $dynconfig_install;
        
        if ($self->{duplicate_build}) {
                $installdir = "bin/install$extradir";
+               $dynconfig = "dynconfig-devel.o";
+               $dynconfig_install = "dynconfig.o";
        } else {
                $installdir = "bin$extradir";
        }
@@ -401,20 +408,20 @@ sub Binary($$)
        if ($self->{duplicate_build}) {
        $self->output(<< "__EOD__"
 #
-$localdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) 
+$localdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $dynconfig
        \@echo Linking \$\@
-       \@\$(LD) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\
-               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
+       \@\$(LD) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) $dynconfig \\
+               \$(INSTALL_LINK_FLAGS) \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__
 );
        }
 
 $self->output(<< "__EOD__"
-$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) 
+$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $dynconfig_install
        \@echo Linking \$\@
        \@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
-               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
+               $dynconfig_install \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__
 );

diff --git a/source/dynconfig.mk b/source/dynconfig.mk
index 180333693d00f3d428fc6c8e953130dd2f898612..76479af0fa7cdabfb87a00793de502f985a37510 100644 (file)
--- a/source/dynconfig.mk
+++ b/source/dynconfig.mk
@@ -28,9 +28,9 @@ DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \
         -DSWATDIR=\"$(srcdir)/../swat\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
         -DMODULESDIR=\"$(builddir)/bin/modules\" \
         -DJSDIR=\"$(srcdir)/scripting/libjs\" \
-        -DSETUPDIR=\"$(srcdir)/setup\" \
+        -DSETUPDIR=\"$(srcdir)/setup\" -DTORTUREDIR=\"$(srcdir)/bin/torture\" \
         -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
 
 dynconfig-devel.o: dynconfig.c Makefile
        @echo Compiling $<
-       @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@
+       @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` -Ilib/replace $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@

diff --git a/source/main.mk b/source/main.mk
index 3767ecab106a9ed53fca2406835b1e8d17178c42..0edf57859fa9d8e369e73f4b4481fde471f83760 100644 (file)
--- a/source/main.mk
+++ b/source/main.mk
@@ -121,7 +121,7 @@ installdirs:
                $(DESTDIR)$(PKGCONFIGDIR) \
                $(DESTDIR)$(CONFIGDIR) \
 
-installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
+installbin: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs
        @$(SHELL) $(srcdir)/script/installbin.sh \
                $(INSTALLPERMS) \
                $(DESTDIR)$(BASEDIR) \

diff --git a/source/param/config.mk b/source/param/config.mk
index 3d83e688f9abe98a7379476412016a8c6c5717e6..683079c16302570fe7619c8328a24b700e6efdea 100644 (file)
--- a/source/param/config.mk
+++ b/source/param/config.mk
@@ -7,7 +7,7 @@ OBJ_FILES = loadparm.o \
                        generic.o \
                        util.o \
                        ../lib/version.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
 PUBLIC_PROTO_HEADER = proto.h
 PUBLIC_HEADERS = param.h
 

diff --git a/source/torture/subunit.c b/source/torture/subunit.c
index 299ca3f0153ccc4d2308038923d13f8f87ca7b41..f7c14aa0238517b47dabefdeafd6736f0972ee92 100644 (file)
--- a/source/torture/subunit.c
+++ b/source/torture/subunit.c
@@ -56,7 +56,7 @@ bool torture_subunit_load_testsuites(const char *directory, bool recursive,
 
        while((entry = readdir(dir))) {
                struct torture_suite *child;
-               if (ISDOT(entry->d_name) || ISDOTDOT(entry->d_name))
+               if (entry->d_name[0] == '.')
                        continue;
 
                if (!recursive && entry->d_type & DT_DIR)