summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2007-06-14 06:05:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:53:19 -0500
commitb163ab8008fb0280677f55c5e5b6e3fddb2e0254 (patch)
treed8a588148c04a422bdfda848d223159b7e92ddf3 /source4
parent91adebe749beb0dc23cacaea316cb2b724776aad (diff)
downloadsamba-b163ab8008fb0280677f55c5e5b6e3fddb2e0254.tar.gz
samba-b163ab8008fb0280677f55c5e5b6e3fddb2e0254.tar.bz2
samba-b163ab8008fb0280677f55c5e5b6e3fddb2e0254.zip
r23481: As per metze's suggestion, move the nsstest files from torture/ to nsswitch/
(This used to be commit 4e7dc9eae4a30f67a87dbf8ccfda7f6a3ace114d)
Diffstat (limited to 'source4')
-rw-r--r--source4/configure.ac2
-rw-r--r--source4/nsswitch/config.mk12
-rw-r--r--source4/nsswitch/nsstest.c (renamed from source4/torture/nsstest.c)2
-rw-r--r--source4/nsswitch/nsstest.h (renamed from source4/torture/nsstest.h)0
-rw-r--r--source4/nsswitch/nsstest.m4 (renamed from source4/torture/nsstest.m4)0
-rw-r--r--source4/torture/config.mk12
6 files changed, 14 insertions, 14 deletions
diff --git a/source4/configure.ac b/source4/configure.ac
index 4feb6debd4..c947a1629a 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -25,7 +25,7 @@ m4_include(lib/util/time.m4)
m4_include(lib/popt/samba.m4)
m4_include(lib/charset/config.m4)
m4_include(lib/socket/config.m4)
-m4_include(torture/nsstest.m4)
+m4_include(nsswitch/nsstest.m4)
#SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
# [samba_cv_internal_talloc=no],
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 9723964a4b..4123194c23 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -3,3 +3,15 @@ VERSION = 0.0.1
SO_VERSION = 0
DESCRIPTION = Client library for communicating with winbind
OBJ_FILES = wb_common.o
+
+#################################
+# Start BINARY nsstest
+[BINARY::nsstest]
+INSTALLDIR = BINDIR
+OBJ_FILES = \
+ nsstest.o
+PRIVATE_DEPENDENCIES = \
+ LIBSAMBA-UTIL \
+ LIBREPLACE_EXT
+# End BINARY nsstest
+#################################
diff --git a/source4/torture/nsstest.c b/source4/nsswitch/nsstest.c
index 0fc2baf068..5a5af8e356 100644
--- a/source4/torture/nsstest.c
+++ b/source4/nsswitch/nsstest.c
@@ -20,7 +20,7 @@
#include "includes.h"
-#include "torture/nsstest.h"
+#include "nsswitch/nsstest.h"
static const char *so_path = "/lib/libnss_winbind.so";
static const char *nss_name = "winbind";
diff --git a/source4/torture/nsstest.h b/source4/nsswitch/nsstest.h
index 4dddf473fc..4dddf473fc 100644
--- a/source4/torture/nsstest.h
+++ b/source4/nsswitch/nsstest.h
diff --git a/source4/torture/nsstest.m4 b/source4/nsswitch/nsstest.m4
index 2856f9de15..2856f9de15 100644
--- a/source4/torture/nsstest.m4
+++ b/source4/nsswitch/nsstest.m4
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 6a825b01a8..42f1d72bb0 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -358,18 +358,6 @@ MANPAGE = man/locktest.1
# End BINARY locktest
#################################
-#################################
-# Start BINARY nsstest
-[BINARY::nsstest]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
- nsstest.o
-PRIVATE_DEPENDENCIES = \
- LIBSAMBA-UTIL \
- LIBREPLACE_EXT
-# End BINARY nsstest
-#################################
-
GCOV_FLAGS = -ftest-coverage -fprofile-arcs
GCOV_LIBS = -lgcov