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

(This used to be commit 4d755fb5d7adedd1dd8bad917b921324411bfd59)

diff --git a/source4/torture/local/registry.c b/source4/lib/registry/tests/generic.c
similarity index 100%
rename from source4/torture/local/registry.c
rename to source4/lib/registry/tests/generic.c

diff --git a/source4/torture/local/socket.c b/source4/lib/socket/testsuite.c
similarity index 100%
rename from source4/torture/local/socket.c
rename to source4/lib/socket/testsuite.c

diff --git a/source4/torture/local/tdr.c b/source4/lib/tdr/testsuite.c
similarity index 100%
rename from source4/torture/local/tdr.c
rename to source4/lib/tdr/testsuite.c

diff --git a/source4/torture/local/util_file.c b/source4/lib/util/tests/file.c
similarity index 100%
rename from source4/torture/local/util_file.c
rename to source4/lib/util/tests/file.c

diff --git a/source4/torture/local/idtree.c b/source4/lib/util/tests/idtree.c
similarity index 100%
rename from source4/torture/local/idtree.c
rename to source4/lib/util/tests/idtree.c

diff --git a/source4/torture/local/util_strlist.c b/source4/lib/util/tests/strlist.c
similarity index 100%
rename from source4/torture/local/util_strlist.c
rename to source4/lib/util/tests/strlist.c

diff --git a/source4/torture/local/binding_string.c b/source4/librpc/tests/binding_string.c
similarity index 100%
rename from source4/torture/local/binding_string.c
rename to source4/librpc/tests/binding_string.c

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index ac4b390e760b05d1d3b5e3121dbebbfe186ab02b..eaf66ea0c359597e1849d9dfdfa089f33e94d7ea 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/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}})) {

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 1397e8600a62f29dc7e2ec890101004cc88a6ab7..b323e996e25642b3388a8c6deaa64c9833a4c1da 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/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 \