summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/lib/registry/tests/generic.c (renamed from source4/torture/local/registry.c)0
-rw-r--r--source4/lib/socket/testsuite.c (renamed from source4/torture/local/socket.c)0
-rw-r--r--source4/lib/tdr/testsuite.c (renamed from source4/torture/local/tdr.c)0
-rw-r--r--source4/lib/util/tests/file.c (renamed from source4/torture/local/util_file.c)0
-rw-r--r--source4/lib/util/tests/idtree.c (renamed from source4/torture/local/idtree.c)0
-rw-r--r--source4/lib/util/tests/strlist.c (renamed from source4/torture/local/util_strlist.c)0
-rw-r--r--source4/librpc/tests/binding_string.c (renamed from source4/torture/local/binding_string.c)0
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm3
-rw-r--r--source4/torture/local/config.mk14
9 files changed, 7 insertions, 10 deletions
diff --git a/source4/torture/local/registry.c b/source4/lib/registry/tests/generic.c
index d200ba6e1b..d200ba6e1b 100644
--- a/source4/torture/local/registry.c
+++ b/source4/lib/registry/tests/generic.c
diff --git a/source4/torture/local/socket.c b/source4/lib/socket/testsuite.c
index e2f9896b33..e2f9896b33 100644
--- a/source4/torture/local/socket.c
+++ b/source4/lib/socket/testsuite.c
diff --git a/source4/torture/local/tdr.c b/source4/lib/tdr/testsuite.c
index 64d4ef84eb..64d4ef84eb 100644
--- a/source4/torture/local/tdr.c
+++ b/source4/lib/tdr/testsuite.c
diff --git a/source4/torture/local/util_file.c b/source4/lib/util/tests/file.c
index 87d25b222e..87d25b222e 100644
--- a/source4/torture/local/util_file.c
+++ b/source4/lib/util/tests/file.c
diff --git a/source4/torture/local/idtree.c b/source4/lib/util/tests/idtree.c
index dd8618d0db..dd8618d0db 100644
--- a/source4/torture/local/idtree.c
+++ b/source4/lib/util/tests/idtree.c
diff --git a/source4/torture/local/util_strlist.c b/source4/lib/util/tests/strlist.c
index 7dbb5f8ce6..7dbb5f8ce6 100644
--- a/source4/torture/local/util_strlist.c
+++ b/source4/lib/util/tests/strlist.c
diff --git a/source4/torture/local/binding_string.c b/source4/librpc/tests/binding_string.c
index f6bf35671e..f6bf35671e 100644
--- a/source4/torture/local/binding_string.c
+++ b/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 ac4b390e76..eaf66ea0c3 100644
--- 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 1397e8600a..b323e996e2 100644
--- 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 \