diff options
| -rwxr-xr-x | tests/run-tests.sh | 12 | ||||
| -rw-r--r-- | tests/slapd.sh.in | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 2478c19..0961496 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -11,6 +11,18 @@ for subdir in "$@" ; do pushd $subdir > /dev/null TEST="$subdir" precmd= + if ! $TESTS_USE_REFINT ; then + if test -s $TESTDIR/$TEST/plugin-need-refint.txt ; then + echo Skipping "$TEST", needs the refint plugin. + continue + fi + fi + if ! $TESTS_USE_MEMBEROF ; then + if test -s $TESTDIR/$TEST/plugin-need-memberof.txt ; then + echo Skipping "$TEST", needs the memberof plugin. + continue + fi + fi if test -x edit-dse-config.sh ; then precmd="$TESTDIR/$subdir/edit-dse-config.sh $BTESTDIR/config/dse.ldif" fi diff --git a/tests/slapd.sh.in b/tests/slapd.sh.in index 2ebb0e7..547f391 100644 --- a/tests/slapd.sh.in +++ b/tests/slapd.sh.in @@ -63,10 +63,10 @@ startslapd() { done test -s $BTESTDIR/config/schema/00core.ldif || ln -s -t $BTESTDIR/config $TESTDIR/config/schema cat $BTESTDIR/config/dse.ldif.initial > $BTESTDIR/config/dse.ldif - if $TESTS_USE_REFINT ; then + if ! test -s $TESTDIR/$TEST/plugin-skip-refint.txt ; then cat $BTESTDIR/config/dse.ldif.refint >> $BTESTDIR/config/dse.ldif fi - if $TESTS_USE_MEMBEROF ; then + if ! test -s $TESTDIR/$TEST/plugin-skip-memberof.txt ; then cat $BTESTDIR/config/dse.ldif.memberof >> $BTESTDIR/config/dse.ldif fi if test -n "$1" && test -s "$1" ; then |