diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-08-19 16:26:13 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-08-19 16:26:13 +0200 |
| commit | 66fb4ebdf605eba523f7b34e422a3c056d559c5d (patch) | |
| tree | 268be6cd0d488878d4da63891a3c82cdafb478d7 | |
| parent | a7ae9fe18348902ada41326d4b0da58d721cc375 (diff) | |
move dict and tio tests into the tests directory
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@359 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/dict/Makefile.am | 27 | ||||
| -rw-r--r-- | tests/test_dict.c (renamed from tests/dict/test_dict.c) | 0 | ||||
| -rw-r--r-- | tests/test_tio.c (renamed from tests/tio/test_tio.c) | 0 | ||||
| -rw-r--r-- | tests/tio/Makefile.am | 29 |
6 files changed, 12 insertions, 58 deletions
diff --git a/configure.ac b/configure.ac index 3dba332..1e7c056 100644 --- a/configure.ac +++ b/configure.ac @@ -320,5 +320,5 @@ AC_SUBST(nss_ldap_so_LIBS) AC_SUBST(nslcd_LIBS) # generate files -AC_CONFIG_FILES([Makefile common/Makefile nss/Makefile nslcd/Makefile man/Makefile tests/Makefile tests/dict/Makefile tests/tio/Makefile]) +AC_CONFIG_FILES([Makefile common/Makefile nss/Makefile nslcd/Makefile man/Makefile tests/Makefile]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index 684da86..8908a2d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA -SUBDIRS = dict tio +TESTS = test_dict test_tio + +check_PROGRAMS = test_dict test_tio noinst_PROGRAMS = test_aliases test_ethers test_group test_hosts \ test_netgroup test_networks test_passwd test_protocols \ @@ -28,6 +30,14 @@ AM_CPPFLAGS=-I$(top_srcdir) # the following enables verbose protocol debugging information to be dumped #AM_CFLAGS=-DDEBUG_PROT -DDEBUG_PROT_DUMP +test_dict_SOURCES = test_dict.c ../common/dict.h +test_dict_LDADD = ../common/dict.o + +test_tio_SOURCES = test_tio.c ../common/tio.h ../common/tio.c +#test_tio_LDADD = ../common/libtio.a +test_tio_CFLAGS = -pthread +test_tio_LDFLAGS = -pthread + common_SOURCES = ../nss/common.c ../nslcd.h ../nss/prototypes.h \ ../common/tio.c ../common/tio.h diff --git a/tests/dict/Makefile.am b/tests/dict/Makefile.am deleted file mode 100644 index 36e471e..0000000 --- a/tests/dict/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Makefile.am - use automake to generate Makefile.in -# -# Copyright (C) 2007 Arthur de Jong -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -TESTS = test_dict - -check_PROGRAMS = test_dict - -AM_CPPFLAGS=-I$(top_srcdir) - -test_dict_SOURCES = test_dict.c ../../common/dict.h -test_dict_LDADD = ../../common/dict.o diff --git a/tests/dict/test_dict.c b/tests/test_dict.c index 7cfc169..7cfc169 100644 --- a/tests/dict/test_dict.c +++ b/tests/test_dict.c diff --git a/tests/tio/test_tio.c b/tests/test_tio.c index 5e8758b..5e8758b 100644 --- a/tests/tio/test_tio.c +++ b/tests/test_tio.c diff --git a/tests/tio/Makefile.am b/tests/tio/Makefile.am deleted file mode 100644 index df02024..0000000 --- a/tests/tio/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile.am - use automake to generate Makefile.in -# -# Copyright (C) 2007 Arthur de Jong -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -TESTS = test_tio - -check_PROGRAMS = test_tio - -AM_CPPFLAGS=-I$(top_srcdir) - -test_tio_SOURCES = test_tio.c ../../common/tio.h ../../common/tio.c -#test_tio_LDADD = ../../common/libtio.a -test_tio_CFLAGS = -pthread -test_tio_LDFLAGS = -pthread |