X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Fdefines.sh;h=6086de52ca869e053fc602f4d80549cd0ac85b6e;hb=cb24efd2879f0f025114df8c9212d48bd0c32517;hp=8f4e7ad1212c40b15f6a5a2d51fa7e6a53321b18;hpb=6fd5e369073d1249afd3edf646a3c8ee266b7ad6;p=openldap diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index 8f4e7ad121..6086de52ca 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2007 The OpenLDAP Foundation. +## Copyright 1998-2011 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -15,6 +15,8 @@ umask 077 +TESTWD=`pwd` + # backends MONITORDB=${AC_monitor-no} BACKLDAP=${AC_ldap-ldapno} @@ -28,6 +30,7 @@ BACKSQL=${AC_sql-sqlno} ACCESSLOG=${AC_accesslog-accesslogno} DDS=${AC_dds-ddsno} DYNLIST=${AC_dynlist-dynlistno} +MEMBEROF=${AC_memberof-memberofno} PROXYCACHE=${AC_pcache-pcacheno} PPOLICY=${AC_ppolicy-ppolicyno} REFINT=${AC_refint-refintno} @@ -41,15 +44,20 @@ VALSORT=${AC_valsort-valsortno} # misc WITH_SASL=${AC_WITH_SASL-no} USE_SASL=${SLAPD_USE_SASL-no} -WITHTLS=${AC_WITHTLS-yes} ACI=${AC_ACI_ENABLED-acino} THREADS=${AC_THREADS-threadsno} +SLEEP1=${SLEEP1-7} +SLEEP2=${SLEEP2-15} # dirs PROGDIR=./progs DATADIR=${USER_DATADIR-./testdata} -TESTDIR=${USER_TESTDIR-./testrun} +TESTDIR=${USER_TESTDIR-$TESTWD/testrun} SCHEMADIR=${USER_SCHEMADIR-./schema} +case "$SCHEMADIR" in +.*) ABS_SCHEMADIR="$TESTWD/$SCHEMADIR" ;; +*) ABS_SCHEMADIR="$SCHEMADIR" ;; +esac DBDIR1A=$TESTDIR/db.1.a DBDIR1B=$TESTDIR/db.1.b @@ -71,17 +79,16 @@ CLIENTDIR=../clients/tools # conf CONF=$DATADIR/slapd.conf CONFTWO=$DATADIR/slapd2.conf +CONF2DB=$DATADIR/slapd-2db.conf MCONF=$DATADIR/slapd-master.conf COMPCONF=$DATADIR/slapd-component.conf PWCONF=$DATADIR/slapd-pw.conf WHOAMICONF=$DATADIR/slapd-whoami.conf ACLCONF=$DATADIR/slapd-acl.conf RCONF=$DATADIR/slapd-referrals.conf -MASTERCONF=$DATADIR/slapd-repl-master.conf SRMASTERCONF=$DATADIR/slapd-syncrepl-master.conf DSRMASTERCONF=$DATADIR/slapd-deltasync-master.conf DSRSLAVECONF=$DATADIR/slapd-deltasync-slave.conf -SLAVECONF=$DATADIR/slapd-repl-slave.conf PPOLICYCONF=$DATADIR/slapd-ppolicy.conf PROXYCACHECONF=$DATADIR/slapd-proxycache.conf CACHEMASTERCONF=$DATADIR/slapd-cache-master.conf @@ -113,7 +120,8 @@ SQLSRMASTERCONF=$DATADIR/slapd-sql-syncrepl-master.conf TRANSLUCENTLOCALCONF=$DATADIR/slapd-translucent-local.conf TRANSLUCENTREMOTECONF=$DATADIR/slapd-translucent-remote.conf METACONF=$DATADIR/slapd-meta.conf -METACONF2=$DATADIR/slapd-meta2.conf +METACONF1=$DATADIR/slapd-meta-target1.conf +METACONF2=$DATADIR/slapd-meta-target2.conf GLUELDAPCONF=$DATADIR/slapd-glue-ldap.conf ACICONF=$DATADIR/slapd-aci.conf VALSORTCONF=$DATADIR/slapd-valsort.conf @@ -124,6 +132,8 @@ PLSRMASTERCONF=$DATADIR/slapd-syncrepl-multiproxy.conf DDSCONF=$DATADIR/slapd-dds.conf PASSWDCONF=$DATADIR/slapd-passwd.conf UNDOCONF=$DATADIR/slapd-config-undo.conf +NAKEDCONF=$DATADIR/slapd-config-naked.conf +VALREGEXCONF=$DATADIR/slapd-valregex.conf DYNAMICCONF=$DATADIR/slapd-dynamic.ldif @@ -135,6 +145,7 @@ CONF4=$TESTDIR/slapd.4.conf CONF5=$TESTDIR/slapd.5.conf CONF6=$TESTDIR/slapd.6.conf ADDCONF=$TESTDIR/slapadd.conf +CONFLDIF=$TESTDIR/slapd-dynamic.ldif LOG1=$TESTDIR/slapd.1.log LOG2=$TESTDIR/slapd.2.log @@ -145,20 +156,21 @@ LOG6=$TESTDIR/slapd.6.log SLAPADDLOG1=$TESTDIR/slapadd.1.log SLURPLOG=$TESTDIR/slurp.log -CONFIGPWF=./configpw +CONFIGPWF=$TESTDIR/configpw # args TOOLARGS="-x $LDAP_TOOLARGS" TOOLPROTO="-P 3" # cmds -LDIFFILTER=$SRCDIR/scripts/acfilter.sh CONFFILTER=$SRCDIR/scripts/conf.sh -SLAPADD="`pwd`/../servers/slapd/slapd -Ta -d 0 $LDAP_VERBOSE" -SLAPCAT="`pwd`/../servers/slapd/slapd -Tc -d 0 $LDAP_VERBOSE" -SLAPINDEX="`pwd`/../servers/slapd/slapd -Ti -d 0 $LDAP_VERBOSE" -SLAPPASSWD="`pwd`/../servers/slapd/slapd -Tpasswd" +MONITORDATA=$SRCDIR/scripts/monitor_data.sh + +SLAPADD="$TESTWD/../servers/slapd/slapd -Ta -d 0 $LDAP_VERBOSE" +SLAPCAT="$TESTWD/../servers/slapd/slapd -Tc -d 0 $LDAP_VERBOSE" +SLAPINDEX="$TESTWD/../servers/slapd/slapd -Ti -d 0 $LDAP_VERBOSE" +SLAPPASSWD="$TESTWD/../servers/slapd/slapd -Tpasswd" unset DIFF_OPTIONS # NOTE: -u/-c is not that portable... @@ -166,8 +178,7 @@ DIFF="diff -i" CMP="diff -i" BCMP="diff -iB" CMPOUT=/dev/null -SLAPD="`pwd`/../servers/slapd/slapd -s0" -SLURPD="`pwd`/../servers/slurpd/slurpd" +SLAPD="$TESTWD/../servers/slapd/slapd -s0" LDAPPASSWD="$CLIENTDIR/ldappasswd $TOOLARGS" LDAPSASLSEARCH="$CLIENTDIR/ldapsearch $TOOLPROTO $LDAP_TOOLARGS -LLL" LDAPSEARCH="$CLIENTDIR/ldapsearch $TOOLPROTO $TOOLARGS -LLL" @@ -180,7 +191,9 @@ LDAPWHOAMI="$CLIENTDIR/ldapwhoami $TOOLARGS" LDAPCOMPARE="$CLIENTDIR/ldapcompare $TOOLARGS" LDAPEXOP="$CLIENTDIR/ldapexop $TOOLARGS" SLAPDTESTER=$PROGDIR/slapd-tester -LVL=${SLAPD_DEBUG-261} +LDIFFILTER=$PROGDIR/ldif-filter +SLAPDMTREAD=$PROGDIR/slapd-mtread +LVL=${SLAPD_DEBUG-0x4105} LOCALHOST=localhost BASEPORT=${SLAPD_BASEPORT-9010} PORT1=`expr $BASEPORT + 1` @@ -198,6 +211,7 @@ URI6="ldap://${LOCALHOST}:$PORT6/" # LDIF LDIF=$DATADIR/test.ldif +LDIFADD1=$DATADIR/do_add.1 LDIFGLUED=$DATADIR/test-glued.ldif LDIFORDERED=$DATADIR/test-ordered.ldif LDIFORDEREDCP=$DATADIR/test-ordered-cp.ldif @@ -236,14 +250,14 @@ SQLADD=$DATADIR/sql-add.ldif MONITOR="" REFDN="c=US" BASEDN="dc=example,dc=com" -MANAGERDN="cn=Manager,dc=example,dc=com" -UPDATEDN="cn=Replica,dc=example,dc=com" +MANAGERDN="cn=Manager,$BASEDN" +UPDATEDN="cn=Replica,$BASEDN" PASSWD=secret -BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,OU=People,dc=example,dc=com" -BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,OU=People,dc=example,dc=com" -JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com" -JOHNDDN="cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com" -MELLIOTDN="cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com" +BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,ou=People,$BASEDN" +BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,ou=People,$BASEDN" +JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,$BASEDN" +JOHNDDN="cn=John Doe,ou=Information Technology Division,ou=People,$BASEDN" +MELLIOTDN="cn=Mark Elliot,ou=Alumni Association,ou=People,$BASEDN" REFINTDN="cn=Manager,o=refint" RETCODEDN="ou=RetCodes,$BASEDN" UNIQUEDN="cn=Manager,o=unique" @@ -252,10 +266,15 @@ TRANSLUCENTROOT="o=translucent" TRANSLUCENTUSER="ou=users,o=translucent" TRANSLUCENTDN="uid=binder,o=translucent" TRANSLUCENTPASSWD="bindtest" -METABASEDN="ou=Meta,dc=example,dc=com" +METABASEDN="ou=Meta,$BASEDN" METAMANAGERDN="cn=Manager,$METABASEDN" VALSORTDN="cn=Manager,o=valsort" VALSORTBASEDN="o=valsort" +MONITORDN="cn=Monitor" +OPERATIONSMONITORDN="cn=Operations,$MONITORDN" +CONNECTIONSMONITORDN="cn=Connections,$MONITORDN" +DATABASESMONITORDN="cn=Databases,$MONITORDN" +STATISTICSMONITORDN="cn=Statistics,$MONITORDN" # generated outputs SEARCHOUT=$TESTDIR/ldapsearch.out @@ -268,6 +287,10 @@ INITOUT=$TESTDIR/init.out VALSORTOUT1=$DATADIR/valsort1.out VALSORTOUT2=$DATADIR/valsort2.out VALSORTOUT3=$DATADIR/valsort3.out +MONITOROUT1=$DATADIR/monitor1.out +MONITOROUT2=$DATADIR/monitor2.out +MONITOROUT3=$DATADIR/monitor3.out +MONITOROUT4=$DATADIR/monitor4.out SERVER1OUT=$TESTDIR/server1.out SERVER1FLT=$TESTDIR/server1.flt @@ -285,7 +308,11 @@ SERVER6FLT=$TESTDIR/server6.flt MASTEROUT=$SERVER1OUT MASTERFLT=$SERVER1FLT SLAVEOUT=$SERVER2OUT +SLAVE2OUT=$SERVER3OUT SLAVEFLT=$SERVER2FLT +SLAVE2FLT=$SERVER3FLT + +MTREADOUT=$TESTDIR/mtread.out # original outputs for cmp PROXYCACHEOUT=$DATADIR/proxycache.out @@ -325,6 +352,7 @@ SUBTREERENAMEOUT=$DATADIR/subtree-rename.out ACIOUT=$DATADIR/aci.out DYNLISTOUT=$DATADIR/dynlist.out DDSOUT=$DATADIR/dds.out +MEMBEROFOUT=$DATADIR/memberof.out +MEMBEROFREFINTOUT=$DATADIR/memberof-refint.out +SHTOOL="$SRCDIR/../build/shtool" -# Just in case we linked the binaries dynamically -LD_LIBRARY_PATH=`pwd`/../libraries:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH