diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-04-22 14:06:04 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2014-04-22 14:59:31 -0400 |
| commit | da7ca2d0334977603b0ac237ac1ab7c5ab71cd10 (patch) | |
| tree | 15b7f362da30dc51aeea48b6dad40116667e62d1 | |
| parent | 6262fd4ebc514b8c6ba80f25a21b8837e6a47ce2 (diff) | |
| download | slapi-nis-da7ca2d0334977603b0ac237ac1ab7c5ab71cd10.tar.gz slapi-nis-da7ca2d0334977603b0ac237ac1ab7c5ab71cd10.tar.xz slapi-nis-da7ca2d0334977603b0ac237ac1ab7c5ab71cd10.zip | |
Tweak the self-tests just a bit
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/slapd.sh.in | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d848bf7..cd2220a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,8 +10,13 @@ wrappers_so_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(wrappers_so_LDFLAGS) $(LDFLA EXTRA_DIST = run-tests.sh test*/*.ldif test*/*.sh test*/*.txt *.supp \ config/slapd-collations.conf config/userRoot.ldif config/schema \ test36-schema-nsswitch/wrap_passwd.in + +CLEANFILES = test36-schema-nsswitch/wrap_passwd +test36-schema-nsswitch/wrap_passwd: $(top_builddir)/config.status test36-schema-nsswitch/wrap_passwd.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + if CAN_TEST -check: +check: test36-schema-nsswitch/wrap_passwd @true if NIS builddir=$(abs_builddir) \ diff --git a/tests/slapd.sh.in b/tests/slapd.sh.in index edb8a22..28c1431 100644 --- a/tests/slapd.sh.in +++ b/tests/slapd.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash SLAPD=@SLAPD@ TESTDIR=@abs_srcdir@ BTESTDIR=@abs_builddir@ @@ -99,16 +99,23 @@ startslapd() { export LD_PRELOAD else ENVCMD= + LD_PRELOAD="$old_ld_preload" + if test -n "$LD_PRELOAD" ; then + export LD_PRELOAD + else + export -n LD_PRELOAD + fi fi @NIS_PLUGIN_CONTINUE_WITHOUT_PORTMAP_ENV@=1 \ @NIS_PLUGIN_PROCESS_UNINTERESTING_UPDATES_ENV@=$process_all \ @SCHEMA_COMPAT_PLUGIN_PROCESS_UNINTERESTING_UPDATES_ENV@=$process_all \ $ENVCMD @TRACE_CMD@ \ $SLAPD -D $BTESTDIR/config -i $STATEDIR/pid -w $STATEDIR/pid - if test -n "$old_ld_preload" ; then - LD_PRELOAD="$old_ld_preload" + LD_PRELOAD="$old_ld_preload" + if test -n "$LD_PRELOAD" ; then + export LD_PRELOAD else - unset LD_PRELOAD + export -n LD_PRELOAD fi if ! add -f $BTESTDIR/config/userRoot.ldif > /dev/null 2> /dev/null ; then local i |