r21656: Move tests a bit closer to the things they test, should make syncing with samba3 easier.

(This used to be commit 4d755fb5d7adedd1dd8bad917b921324411bfd59)

source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm

@@ -1481,8 +1481,6 @@ sub ParseStructPrint($$$)
 
 	my $env = GenerateStructEnv($struct, $varname);
 
-	EnvSubstituteValue($env, $struct);
-
 	DeclareArrayVariables($_) foreach (@{$struct->{ELEMENTS}});
 
 	pidl "ndr_print_struct(ndr, name, \"$name\");";
@@ -2049,7 +2047,6 @@ sub ParseFunctionPrint($)
 	pidl "ndr->depth++;";
 
 	my $env = GenerateFunctionInEnv($fn);
-	EnvSubstituteValue($env, $fn);
 
 	foreach my $e (@{$fn->{ELEMENTS}}) {
 		if (grep(/in/,@{$e->{DIRECTION}})) {

source4/torture/local/config.mk

@@ -16,16 +16,16 @@ OBJ_FILES = \
 		../../lib/replace/test/os2_delete.o \
 		../../lib/replace/test/testsuite.o \
 		messaging.o \
-		binding_string.o \
-		idtree.o \
-		socket.o \
+		../../librpc/tests/binding_string.o \
+		../../lib/util/tests/idtree.o \
+		../../lib/socket/testsuite.o \
 		irpc.o \
-		registry.o \
+		../../lib/registry/tests/generic.o \
 		resolve.o \
-		util_strlist.o \
-		util_file.o \
+		../../lib/util/tests/strlist.o \
+		../../lib/util/tests/file.o \
 		sddl.o \
-		tdr.o \
+		../../lib/tdr/testsuite.o \
 		event.o \
 		local.o \
 		dbspeed.o \