From 80a5da73e9a9ed148314be3fa071181c82fc7c64 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 14:36:41 +0200 Subject: Share talloc source code between Samba 3 and Samba 4. --- source4/torture/local/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index cd1c7b1422..b57093178e 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -20,7 +20,7 @@ PRIVATE_DEPENDENCIES = \ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../lib/charset/tests/iconv.o \ - $(torturesrcdir)/../lib/talloc/testsuite.o \ + $(torturesrcdir)/../../talloc/testsuite.o \ $(torturesrcdir)/../lib/replace/test/getifaddrs.o \ $(torturesrcdir)/../lib/replace/test/os2_delete.o \ $(torturesrcdir)/../lib/replace/test/strptime.o \ -- cgit From 0888ffa2b7382a1c4781ae54bad53eac3b229365 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 16:30:14 +0200 Subject: Make Samba 3 and Samba 4 both use the same single copy of libreplace. --- source4/torture/local/config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index cd1c7b1422..fede753c68 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -21,10 +21,10 @@ PRIVATE_DEPENDENCIES = \ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../lib/charset/tests/iconv.o \ $(torturesrcdir)/../lib/talloc/testsuite.o \ - $(torturesrcdir)/../lib/replace/test/getifaddrs.o \ - $(torturesrcdir)/../lib/replace/test/os2_delete.o \ - $(torturesrcdir)/../lib/replace/test/strptime.o \ - $(torturesrcdir)/../lib/replace/test/testsuite.o \ + $(torturesrcdir)/../../replace/test/getifaddrs.o \ + $(torturesrcdir)/../../replace/test/os2_delete.o \ + $(torturesrcdir)/../../replace/test/strptime.o \ + $(torturesrcdir)/../../replace/test/testsuite.o \ $(torturesrcdir)/../lib/messaging/tests/messaging.o \ $(torturesrcdir)/../lib/messaging/tests/irpc.o \ $(torturesrcdir)/../librpc/tests/binding_string.o \ -- cgit From 41669237cd714c59af9e634cb2ac162d6ee57e82 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 16:39:45 +0200 Subject: Use single copy of socket_wrapper in Samba 3 and Samba 4. --- source4/torture/local/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index cd1c7b1422..fd3f6a61d5 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -30,7 +30,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../librpc/tests/binding_string.o \ $(torturesrcdir)/../lib/util/tests/idtree.o \ $(torturesrcdir)/../lib/socket/testsuite.o \ - $(torturesrcdir)/../lib/socket_wrapper/testsuite.o \ + $(torturesrcdir)/../../socket_wrapper/testsuite.o \ $(torturesrcdir)/../libcli/resolve/testsuite.o \ $(torturesrcdir)/../lib/util/tests/strlist.o \ $(torturesrcdir)/../lib/util/tests/str.o \ -- cgit From 9c466a61588cf7eb442450d57cf2a46355e8907a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 19:07:02 +0200 Subject: Use single copy of compression library in Samba3,4. --- source4/torture/local/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index cd1c7b1422..ffd0255f35 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -36,7 +36,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../lib/util/tests/str.o \ $(torturesrcdir)/../lib/util/tests/file.o \ $(torturesrcdir)/../lib/util/tests/genrand.o \ - $(torturesrcdir)/../lib/compression/testsuite.o \ + $(torturesrcdir)/../../compression/testsuite.o \ $(torturesrcdir)/../lib/charset/tests/charset.o \ $(torturesrcdir)/../libcli/security/tests/sddl.o \ $(torturesrcdir)/../lib/tdr/testsuite.o \ -- cgit From 94855cd69248f0f90b6c828588afa012adc8bd45 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 17 Sep 2008 14:11:12 +0200 Subject: Move common libraries from root to lib/. --- source4/torture/local/config.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 54cbdae837..4cd9f6c865 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -20,23 +20,23 @@ PRIVATE_DEPENDENCIES = \ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../lib/charset/tests/iconv.o \ - $(torturesrcdir)/../../talloc/testsuite.o \ - $(torturesrcdir)/../../replace/test/getifaddrs.o \ - $(torturesrcdir)/../../replace/test/os2_delete.o \ - $(torturesrcdir)/../../replace/test/strptime.o \ - $(torturesrcdir)/../../replace/test/testsuite.o \ + $(torturesrcdir)/../../lib/talloc/testsuite.o \ + $(torturesrcdir)/../../lib/replace/test/getifaddrs.o \ + $(torturesrcdir)/../../lib/replace/test/os2_delete.o \ + $(torturesrcdir)/../../lib/replace/test/strptime.o \ + $(torturesrcdir)/../../lib/replace/test/testsuite.o \ $(torturesrcdir)/../lib/messaging/tests/messaging.o \ $(torturesrcdir)/../lib/messaging/tests/irpc.o \ $(torturesrcdir)/../librpc/tests/binding_string.o \ $(torturesrcdir)/../lib/util/tests/idtree.o \ $(torturesrcdir)/../lib/socket/testsuite.o \ - $(torturesrcdir)/../../socket_wrapper/testsuite.o \ + $(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \ $(torturesrcdir)/../libcli/resolve/testsuite.o \ $(torturesrcdir)/../lib/util/tests/strlist.o \ $(torturesrcdir)/../lib/util/tests/str.o \ $(torturesrcdir)/../lib/util/tests/file.o \ $(torturesrcdir)/../lib/util/tests/genrand.o \ - $(torturesrcdir)/../../compression/testsuite.o \ + $(torturesrcdir)/../../lib/compression/testsuite.o \ $(torturesrcdir)/../lib/charset/tests/charset.o \ $(torturesrcdir)/../libcli/security/tests/sddl.o \ $(torturesrcdir)/../lib/tdr/testsuite.o \ -- cgit From caa4e428604780bb098060f7286c69d30c8b4007 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 11 Oct 2008 21:05:38 +0200 Subject: Move lib/util from source4 to top-level libutil. Conflicts: source4/Makefile --- source4/torture/local/config.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 4cd9f6c865..1f87912e8b 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -28,14 +28,14 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../lib/messaging/tests/messaging.o \ $(torturesrcdir)/../lib/messaging/tests/irpc.o \ $(torturesrcdir)/../librpc/tests/binding_string.o \ - $(torturesrcdir)/../lib/util/tests/idtree.o \ + $(torturesrcdir)/../../lib/util/tests/idtree.o \ $(torturesrcdir)/../lib/socket/testsuite.o \ $(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \ $(torturesrcdir)/../libcli/resolve/testsuite.o \ - $(torturesrcdir)/../lib/util/tests/strlist.o \ - $(torturesrcdir)/../lib/util/tests/str.o \ - $(torturesrcdir)/../lib/util/tests/file.o \ - $(torturesrcdir)/../lib/util/tests/genrand.o \ + $(torturesrcdir)/../../lib/util/tests/strlist.o \ + $(torturesrcdir)/../../lib/util/tests/str.o \ + $(torturesrcdir)/../../lib/util/tests/file.o \ + $(torturesrcdir)/../../lib/util/tests/genrand.o \ $(torturesrcdir)/../../lib/compression/testsuite.o \ $(torturesrcdir)/../lib/charset/tests/charset.o \ $(torturesrcdir)/../libcli/security/tests/sddl.o \ -- cgit From 75a36a9a5491b86aaa3b0983d5a2bd5d024f783a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 11 Oct 2008 23:25:35 +0200 Subject: Add some simple tests for lib/util/time.c --- source4/torture/local/config.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 1f87912e8b..79df834525 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -34,6 +34,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../libcli/resolve/testsuite.o \ $(torturesrcdir)/../../lib/util/tests/strlist.o \ $(torturesrcdir)/../../lib/util/tests/str.o \ + $(torturesrcdir)/../../lib/util/tests/time.o \ $(torturesrcdir)/../../lib/util/tests/file.o \ $(torturesrcdir)/../../lib/util/tests/genrand.o \ $(torturesrcdir)/../../lib/compression/testsuite.o \ -- cgit From d7371dae24a8ec341713d004c2ac9444ec4b14de Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 12 Oct 2008 01:56:11 +0200 Subject: Add one-test testsuite for datablob. --- source4/torture/local/config.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/local/config.mk') diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 79df834525..9ea212dfa5 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -35,6 +35,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../../lib/util/tests/strlist.o \ $(torturesrcdir)/../../lib/util/tests/str.o \ $(torturesrcdir)/../../lib/util/tests/time.o \ + $(torturesrcdir)/../../lib/util/tests/data_blob.o \ $(torturesrcdir)/../../lib/util/tests/file.o \ $(torturesrcdir)/../../lib/util/tests/genrand.o \ $(torturesrcdir)/../../lib/compression/testsuite.o \ -- cgit