nss-pam-ldapd commit: r1416 - nss-pam-ldapd/tests

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sat Mar 26 17:16:16 2011
New Revision: 1416
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1416

Log:
ensure that all test source files are distibuted and can tests can be run when 
source directory differs from build directory

Modified:
   nss-pam-ldapd/tests/Makefile.am
   nss-pam-ldapd/tests/test_nsscmds.sh
   nss-pam-ldapd/tests/test_pamcmds.sh

Modified: nss-pam-ldapd/tests/Makefile.am
==============================================================================
--- nss-pam-ldapd/tests/Makefile.am     Sat Mar 26 15:36:17 2011        (r1415)
+++ nss-pam-ldapd/tests/Makefile.am     Sat Mar 26 17:16:16 2011        (r1416)
@@ -44,13 +44,13 @@
 test_set_SOURCES = test_set.c ../common/set.h
 test_set_LDADD = ../common/libdict.a
 
-test_tio_SOURCES = test_tio.c ../common/tio.h ../common/tio.c
+test_tio_SOURCES = test_tio.c common.h ../common/tio.h ../common/tio.c
 test_tio_LDFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
-test_expr_SOURCES = test_expr.c
+test_expr_SOURCES = test_expr.c common.h
 test_expr_LDADD = ../common/set.o ../common/dict.o
 
-test_getpeercred_SOURCES = test_getpeercred.c
+test_getpeercred_SOURCES = test_getpeercred.c common.h
 test_getpeercred_LDADD = ../compat/libcompat.a
 
 # common objects that are included for the tests of nslcd functionality
@@ -64,11 +64,11 @@
                      ../common/libdict.a ../common/libexpr.a \
                      ../compat/libcompat.a
 
-test_cfg_SOURCES = test_cfg.c
+test_cfg_SOURCES = test_cfg.c common.h
 test_cfg_LDADD = $(common_nslcd_LDADD)
 
-test_myldap_SOURCES = test_myldap.c
+test_myldap_SOURCES = test_myldap.c common.h
 test_myldap_LDADD = ../nslcd/cfg.o $(common_nslcd_LDADD)
 
-test_common_SOURCES = test_common.c
+test_common_SOURCES = test_common.c ../nslcd/common.h
 test_common_LDADD = ../nslcd/cfg.o $(common_nslcd_LDADD)

Modified: nss-pam-ldapd/tests/test_nsscmds.sh
==============================================================================
--- nss-pam-ldapd/tests/test_nsscmds.sh Sat Mar 26 15:36:17 2011        (r1415)
+++ nss-pam-ldapd/tests/test_nsscmds.sh Sat Mar 26 17:16:16 2011        (r1416)
@@ -26,11 +26,13 @@
 
 set -e
 
+# find source directory
+srcdir="${srcdir-"."}"
+
 # ensure that we are running in the test environment
-. ./in_testenv.sh
+. "$srcdir/in_testenv.sh"
 
 # preload our own NSS module
-srcdir="${srcdir-"."}"
 LD_PRELOAD="$srcdir/../nss/nss_ldap.so"
 export LD_PRELOAD
 

Modified: nss-pam-ldapd/tests/test_pamcmds.sh
==============================================================================
--- nss-pam-ldapd/tests/test_pamcmds.sh Sat Mar 26 15:36:17 2011        (r1415)
+++ nss-pam-ldapd/tests/test_pamcmds.sh Sat Mar 26 17:16:16 2011        (r1416)
@@ -21,8 +21,11 @@
 
 set -e
 
+# find source directory
+srcdir="${srcdir-"."}"
+
 # ensure that we are running in the test environment
-. ./in_testenv.sh
+. "$srcdir/in_testenv.sh"
 
 # check if we have expect installed
 EXPECT="$(which expect 2> /dev/null || true)"
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits