svn commit: samba r19358 - in branches/SAMBA_4_0/source: . bin/install/torture/LOCAL bin/torture/LOCAL build/smb_build param torture

[jelmer at samba.org]

Author: jelmer
Date: 2006-10-17 00:56:29 +0000 (Tue, 17 Oct 2006)
New Revision: 19358

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19358

Log:
Use subunit tests from the right location (from 
$src/bin/torture when developing, $LIBDIR/torture when installed)

Modified:
   branches/SAMBA_4_0/source/bin/install/torture/LOCAL/
   branches/SAMBA_4_0/source/bin/torture/LOCAL/
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/dynconfig.mk
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/param/config.mk
   branches/SAMBA_4_0/source/torture/subunit.c


Changeset:

Property changes on: branches/SAMBA_4_0/source/bin/install/torture/LOCAL
___________________________________________________________________
Name: svn:ignore
   + *



Property changes on: branches/SAMBA_4_0/source/bin/torture/LOCAL
___________________________________________________________________
Name: svn:ignore
   + *


Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-10-17 00:27:24 UTC (rev 19357)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-10-17 00:56:29 UTC (rev 19358)
@@ -110,9 +110,11 @@
 	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 @@
 		$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 @@
 	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__
 );

Modified: branches/SAMBA_4_0/source/dynconfig.mk
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.mk	2006-10-17 00:27:24 UTC (rev 19357)
+++ branches/SAMBA_4_0/source/dynconfig.mk	2006-10-17 00:56:29 UTC (rev 19358)
@@ -28,9 +28,9 @@
 	 -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 $@

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-10-17 00:27:24 UTC (rev 19357)
+++ branches/SAMBA_4_0/source/main.mk	2006-10-17 00:56:29 UTC (rev 19358)
@@ -121,7 +121,7 @@
 		$(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) \

Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk	2006-10-17 00:27:24 UTC (rev 19357)
+++ branches/SAMBA_4_0/source/param/config.mk	2006-10-17 00:56:29 UTC (rev 19358)
@@ -7,7 +7,7 @@
 			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
 

Modified: branches/SAMBA_4_0/source/torture/subunit.c
===================================================================
--- branches/SAMBA_4_0/source/torture/subunit.c	2006-10-17 00:27:24 UTC (rev 19357)
+++ branches/SAMBA_4_0/source/torture/subunit.c	2006-10-17 00:56:29 UTC (rev 19358)
@@ -56,7 +56,7 @@
 
 	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)