Check slapadd result before continuing with test

diff --git a/tests/scripts/lloadd/test001-backend-issues b/tests/scripts/lloadd/test001-backend-issues
index 9b0b0b21b61084e945e6016df1016a497b76751b..b7f99fccca1b3443d8b54162ec8becd5b74b5691 100755 (executable)
--- a/tests/scripts/lloadd/test001-backend-issues
+++ b/tests/scripts/lloadd/test001-backend-issues
@@ -55,6 +55,7 @@ $SLAPADD -f $CONF3 -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
     echo "slapadd failed ($RC)!"
+    test $KILLSERVERS != no && kill -HUP $KILLPIDS
     exit $RC
 fi
 

diff --git a/tests/scripts/lloadd/test002-load b/tests/scripts/lloadd/test002-load
index 942f6bc404d624c09cbcf73cb418a9da4dc562b4..2de04d6ebd5d59f6caaeb343bd082f3eeef9f9ce 100755 (executable)
--- a/tests/scripts/lloadd/test002-load
+++ b/tests/scripts/lloadd/test002-load
@@ -74,6 +74,7 @@ $SLAPADD -f $CONF3 -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
     echo "slapadd failed ($RC)!"
+    test $KILLSERVERS != no && kill -HUP $KILLPIDS
     exit $RC
 fi
 

diff --git a/tests/scripts/lloadd/test003-cnconfig b/tests/scripts/lloadd/test003-cnconfig
index edf5801a8e233bcbc06a70e8dc21a91b6477ca74..b578b9664518985f5ef034531b9d3ee71779b21e 100755 (executable)
--- a/tests/scripts/lloadd/test003-cnconfig
+++ b/tests/scripts/lloadd/test003-cnconfig
@@ -75,6 +75,7 @@ $SLAPADD -f $CONF3 -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
     echo "slapadd failed ($RC)!"
+    test $KILLSERVERS != no && kill -HUP $KILLPIDS
     exit $RC
 fi
 

diff --git a/tests/scripts/lloadd/test004-monitor b/tests/scripts/lloadd/test004-monitor
index d1db7c1c5df1ed032cac7c3e9addb7f2ae1f9ead..5fe927606d2ca6ef9f239d1cf51d42b8624c887b 100755 (executable)
--- a/tests/scripts/lloadd/test004-monitor
+++ b/tests/scripts/lloadd/test004-monitor
@@ -87,6 +87,7 @@ $SLAPADD -f $CONF3 -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
     echo "slapadd failed ($RC)!"
+    test $KILLSERVERS != no && kill -HUP $KILLPIDS
     exit $RC
 fi
 

diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 88a57b9ade32a04d308afa26e43942b4c8ffa8c9..b05e041454d61e210e4c12d66bef4221610bbaaf 100755 (executable)
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -61,6 +61,12 @@ esac
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 cd $PRODIR
 $SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
@@ -134,6 +140,13 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 cd $CONDIR
 $SLAPD -F ./slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!

diff --git a/tests/scripts/test050-syncrepl-multiprovider b/tests/scripts/test050-syncrepl-multiprovider
index d32ae669fe34ce07e4a928a8343274e29540490d..065c86a59afcce78ed04cea9c30bfba48950a36d 100755 (executable)
--- a/tests/scripts/test050-syncrepl-multiprovider
+++ b/tests/scripts/test050-syncrepl-multiprovider
@@ -79,6 +79,11 @@ objectClass: olcDatabaseConfig
 olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 EOF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 n=`expr $n + 1`
 done

diff --git a/tests/scripts/test053-syncprov-glue b/tests/scripts/test053-syncprov-glue
index a75a318fc19c58f657446274ac8bfba5abc3b8a3..3caa0d4fb22d90abda00f0ae3ce89e7cc02f9fa4 100755 (executable)
--- a/tests/scripts/test053-syncprov-glue
+++ b/tests/scripts/test053-syncprov-glue
@@ -74,6 +74,11 @@ olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 
 EOF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 echo "Initializing provider2 configurations..."
 $SLAPADD -F $CFPRO2 -n 0 <<EOF
@@ -87,6 +92,11 @@ olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 
 EOF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 $SLAPADD -F $CFCONS -n 0 <<EOF
 dn: cn=config
@@ -98,6 +108,11 @@ objectClass: olcDatabaseConfig
 olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 EOF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 cd $PRODDIR

diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 22015a7251df8aadfdf201e679419c354bd467d9..f950761f5fda40061a5bcd287e5da5350803bf2d 100755 (executable)
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -175,6 +175,12 @@ olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 
 EOF
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapadd failed ($RC)!"
+               exit $RC
+       fi
+
        ID=`expr $ID + 1`
 done
 
@@ -191,6 +197,12 @@ olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 
 EOF
+
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 done
 
 echo "Starting central provider slapd on TCP/IP port $PORT1..."

diff --git a/tests/scripts/test059-consumer-config b/tests/scripts/test059-consumer-config
index 56848db200bbd810abb875d5e9b1e76a0d6aa7a5..30e87e41a0af7b63f6e3da1d0d56cb15b74f3cbe 100755 (executable)
--- a/tests/scripts/test059-consumer-config
+++ b/tests/scripts/test059-consumer-config
@@ -57,6 +57,12 @@ esac
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
@@ -182,6 +188,13 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 $SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/scripts/test061-syncreplication-initiation b/tests/scripts/test061-syncreplication-initiation
index a8ce51c1904372130bf5f8ed7600518d20418966..3e3b9735f7b6868700d9990f73638fe979893035 100755 (executable)
--- a/tests/scripts/test061-syncreplication-initiation
+++ b/tests/scripts/test061-syncreplication-initiation
@@ -82,6 +82,12 @@ olcDatabase: {0}config
 olcRootPW:< file://$CONFIGPWF
 
 EOF
+
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapadd failed ($RC)!"
+               exit $RC
+       fi
 done
 
 echo "Starting provider slapd on $PROV_URI"

diff --git a/tests/scripts/test062-config-delete b/tests/scripts/test062-config-delete
index dde8acd43af2cb2ea15effcafda7809a8210f611..afb87c4348d3a57d1ec118f070b07a455736c1ba 100755 (executable)
--- a/tests/scripts/test062-config-delete
+++ b/tests/scripts/test062-config-delete
@@ -39,6 +39,12 @@ $SLAPPASSWD -g -n >$CONFIGPWF
 echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 cd $TESTDIR
 $SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!

diff --git a/tests/scripts/test063-delta-multiprovider b/tests/scripts/test063-delta-multiprovider
index df4bdd1ab6fc796eb0dc1a2658ca4ca777b4a10b..8ce59068959380684470d74ee91fa8a51b5f3cb9 100755 (executable)
--- a/tests/scripts/test063-delta-multiprovider
+++ b/tests/scripts/test063-delta-multiprovider
@@ -214,6 +214,12 @@ olcDatabase: {3}monitor
 EOF
 
 $SLAPADD -F $CFDIR -n 0  -d-1< $TMP > $TESTOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}

diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
index c263cf9f181ca800d922a9cb39c025839ba27fa6..55191234363081c15d30ab2fdb897023ecf01c6c 100755 (executable)
--- a/tests/scripts/test064-constraint
+++ b/tests/scripts/test064-constraint
@@ -120,6 +120,11 @@ olcConstraintAttribute: uid
 EOF
 
 $SLAPADD -F $CONFDIR -n 0 -l $TESTDIR/config.ldif
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 $SLAPD -F $CONFDIR -h $URI1 -d $LVL > $LOG1 2>&1 &

diff --git a/tests/scripts/test066-autoca b/tests/scripts/test066-autoca
index fd23140708685b20ba8103573463ef59c1946614..dd8b502af25c7d9cfd90cf60785c78f2d49387f0 100755 (executable)
--- a/tests/scripts/test066-autoca
+++ b/tests/scripts/test066-autoca
@@ -47,6 +47,12 @@ $SLAPPASSWD -g -n >$CONFIGPWF
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPD -F $CFDIR -h $URIP1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/scripts/test069-delta-multiprovider-starttls b/tests/scripts/test069-delta-multiprovider-starttls
index 2f5a0d30f53931fe0ba15b19b83a0f7ac5057b5c..277c0a74586f3d62484e2ff19599f6243121b30d 100755 (executable)
--- a/tests/scripts/test069-delta-multiprovider-starttls
+++ b/tests/scripts/test069-delta-multiprovider-starttls
@@ -195,7 +195,14 @@ olcAccessLogOps: writes
 olcAccessLogSuccess: TRUE
 
 EOF
+
 $SLAPADD -F $CFDIR -n 0  -d-1< $TMP > $TESTOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}

diff --git a/tests/scripts/test070-delta-multiprovider-ldaps b/tests/scripts/test070-delta-multiprovider-ldaps
index 18869d1c38a332d85379ce7f85c67971f7edb3b9..3fb96ccd7e49e45c9b04f2a13d35f7c44bec70f8 100755 (executable)
--- a/tests/scripts/test070-delta-multiprovider-ldaps
+++ b/tests/scripts/test070-delta-multiprovider-ldaps
@@ -195,6 +195,12 @@ olcAccessLogSuccess: TRUE
 
 EOF
 $SLAPADD -F $CFDIR -n 0  -d-1< $TMP > $TESTOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}

diff --git a/tests/scripts/test071-dirsync b/tests/scripts/test071-dirsync
index 9f5aedef5ab7c23a144de482e1e04a3a7d74d0de..455629b79e7da303c2fb413951432638e76ca051 100755 (executable)
--- a/tests/scripts/test071-dirsync
+++ b/tests/scripts/test071-dirsync
@@ -88,6 +88,13 @@ objectclass: dcObject
 o: OpenLDAP Testing
 
 EOMODS
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 $SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/scripts/test076-authid-rewrite b/tests/scripts/test076-authid-rewrite
index 7799d88559cdb323f40b68937a3a0ebd33c5e123..383e4c3f59b4a104998b6ba61f0ae371d407b927 100755 (executable)
--- a/tests/scripts/test076-authid-rewrite
+++ b/tests/scripts/test076-authid-rewrite
@@ -31,6 +31,12 @@ $SLAPPASSWD -g -n >$CONFIGPWF
 echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 cd $TESTDIR
 $SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!

diff --git a/tests/scripts/test078-persistent-sessionlog b/tests/scripts/test078-persistent-sessionlog
index acb8fad5017033fdedd3bee02ee4a3694415d558..8f3d07ff6fa43fa521ab6c61ab41fdc5db28597c 100755 (executable)
--- a/tests/scripts/test078-persistent-sessionlog
+++ b/tests/scripts/test078-persistent-sessionlog
@@ -185,6 +185,12 @@ olcAccessLogSuccess: TRUE
 
 EOF
 $SLAPADD -F $CFDIR -n 0  -d-1< $TMP > $TESTOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}

diff --git a/tests/scripts/test083-argon2 b/tests/scripts/test083-argon2
index 9700f1a2ae3a74bcf39812fa9ec8e218c8332314..01803b359172a229e9d7daacc1896d26e3b9203a 100755 (executable)
--- a/tests/scripts/test083-argon2
+++ b/tests/scripts/test083-argon2
@@ -97,6 +97,11 @@ EOF
 fi
 
 $SLAPADD -F $CONFDIR -n 0 -l $TESTDIR/config.ldif
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 $SLAPD -F $CONFDIR -h $URI1 -d $LVL > $LOG1 2>&1 &

diff --git a/tests/scripts/test086-delta-consumer-config b/tests/scripts/test086-delta-consumer-config
index b8f08cf68fa0b8b5de526d68acf9f80167a1b640..d89af3f0bb71ce227ecdb9ad3e03f8a545f675cd 100755 (executable)
--- a/tests/scripts/test086-delta-consumer-config
+++ b/tests/scripts/test086-delta-consumer-config
@@ -61,6 +61,12 @@ esac
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
@@ -324,6 +330,13 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 $SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then