ITS#10472 Check tool return codes when missing

diff --git a/contrib/slapd-modules/variant/tests/scripts/test001-config b/contrib/slapd-modules/variant/tests/scripts/test001-config
index 1c6a55e2edab6a1fb5a4b5fc0f30ad9bc5ba09af..de927dc057e81bcbd2c106542af9f0703bbf10eb 100755 (executable)
--- a/contrib/slapd-modules/variant/tests/scripts/test001-config
+++ b/contrib/slapd-modules/variant/tests/scripts/test001-config
@@ -96,6 +96,12 @@ echo "database config" >>$CONF2
 echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >>$CONF2
 
 $SLAPADD -f $CONF2 -l $LDIFORDERED
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPD -Tt -f $CONF2 -F $TESTDIR/conftest -d $LVL >> $LOG2 2>&1
 RC=$?
 if test $RC != 0 ; then

diff --git a/tests/data/regressions/its7573/its7573 b/tests/data/regressions/its7573/its7573
index cd5a2490f60ba2f2036a9fbbf6d24f02ff3aa1d6..aa5914dffeb2600787ff6e717bc66034d123176a 100755 (executable)
--- a/tests/data/regressions/its7573/its7573
+++ b/tests/data/regressions/its7573/its7573
@@ -33,6 +33,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/data/regressions/its8427/its8427 b/tests/data/regressions/its8427/its8427
index 92dc2cd1e051809acf78d8c805b32bc5fe05b064..856f3013f308f31a94523dc4790df3c5125235ef 100755 (executable)
--- a/tests/data/regressions/its8427/its8427
+++ b/tests/data/regressions/its8427/its8427
@@ -130,6 +130,11 @@ EOF
 echo "Configuring provider"
 cd $TESTDIR/srv1
 $SLAPADD -F ./slapd.d -n 0 -d-1 < $TMP > $TESTOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 $SLAPADD -F ./slapd.d -n 0 -d-1 <<EOF >> $TESTOUT 2>&1
 dn: olcOverlay=syncprov,olcDatabase={1}$BACKEND,cn=config
@@ -138,6 +143,12 @@ objectClass: olcSyncProvConfig
 olcOverlay: syncprov
 EOF
 
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 echo "Starting provider..."
 $SLAPD -F ./slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL > $LOG1 2>&1 &
 MASTERPID=$!
@@ -169,6 +180,11 @@ fi
 echo "Configuring consumer"
 cd $TESTDIR/srv2
 $SLAPADD -F ./slapd.d -n 0 -d-1 < $TMP >> $TESTOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 $SLAPMODIFY -F ./slapd.d -n 0 -d-1 <<EOF >> $TESTOUT 2>&1
 dn: olcDatabase={1}$BACKEND,cn=config
@@ -180,6 +196,12 @@ olcSyncRepl: rid=001 provider=ldaps://127.0.0.2:$PORT1
   tls_cacert=$TESTDIR/tls/ca/certs/testsuiteCA.crt tls_reqcert=allow
 EOF
 
+RC=$?
+if test $RC != 0 ; then
+       echo "slapmodify failed ($RC)!"
+       exit $RC
+fi
+
 echo "Starting consumer..."
 $SLAPD -F ./slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 SLAVEPID=$!

diff --git a/tests/data/regressions/its8444/its8444 b/tests/data/regressions/its8444/its8444
index bccfd489c25959b66c56b1b615e8bfcfefa2ee94..1fd72648181b6ab751d1e533b511c73d1e130e46 100755 (executable)
--- a/tests/data/regressions/its8444/its8444
+++ b/tests/data/regressions/its8444/its8444
@@ -61,6 +61,12 @@ while [ $n -le $MPR ]; do
        mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
        . $CONFFILTER $BACKEND < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
        $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapadd failed ($RC)!"
+               exit $RC
+       fi
+
        n=`expr $n + 1`
 done
 

diff --git a/tests/data/regressions/its8521/its8521 b/tests/data/regressions/its8521/its8521
index e7485d5328c14e40fe2fa6ecf885c72c7d11ac3e..58096ba6ea9cbf26246345cd0425978c68b634cf 100755 (executable)
--- a/tests/data/regressions/its8521/its8521
+++ b/tests/data/regressions/its8521/its8521
@@ -47,6 +47,12 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $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
@@ -78,6 +84,12 @@ fi
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/data/regressions/its8616/its8616 b/tests/data/regressions/its8616/its8616
index e8b163d9d49e6f267663f2d70a536ab9328fb620..c1288333473a7daf20877219cd9672a85b1be6ef 100755 (executable)
--- a/tests/data/regressions/its8616/its8616
+++ b/tests/data/regressions/its8616/its8616
@@ -40,6 +40,12 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $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

diff --git a/tests/data/regressions/its8663/its8663 b/tests/data/regressions/its8663/its8663
index 2612b22bc7cb6f05da46ad60dcd415ed70bf0358..9ffd82724e55353746482fc07968052c19b6a920 100755 (executable)
--- a/tests/data/regressions/its8663/its8663
+++ b/tests/data/regressions/its8663/its8663
@@ -40,6 +40,12 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $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

diff --git a/tests/data/regressions/its8667/its8667 b/tests/data/regressions/its8667/its8667
index db2713d24e58f37cbf425111e3a00cfe48e8169c..f62661cf6f267c9806403ae10201714ac267dcfd 100755 (executable)
--- a/tests/data/regressions/its8667/its8667
+++ b/tests/data/regressions/its8667/its8667
@@ -38,6 +38,11 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $ITSDIR/slapd.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 echo "Populating root database..."
 $SLAPADD -F $CFPRO -b "dc=example,dc=com" -l $ITSDIR/root.ldif >> $TESTOUT 2>&1

diff --git a/tests/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800
index 80926a260fc9714925290acf6a81a2c3a2414953..7f3ba3554fdbb3d553ff9bc8cf2e8455f44c83b7 100755 (executable)
--- a/tests/data/regressions/its8800/its8800
+++ b/tests/data/regressions/its8800/its8800
@@ -58,7 +58,19 @@ while [ $n -le $MPR ]; do
        mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
        . $CONFFILTER $BACKEND < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
        $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapadd failed ($RC)!"
+               exit $RC
+       fi
+
        $SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapadd failed ($RC)!"
+               exit $RC
+       fi
+
        n=`expr $n + 1`
 done
 
@@ -142,6 +154,12 @@ mv $DBDIR.1 $DBDIR.1.orig
 mv $DBDIR.2 $DBDIR.2.orig
 mkdir -p $DBDIR.1 $DBDIR.2
 $SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 echo "done"
 
 echo "Starting provider1 slapd on TCP/IP URI $URI1"
@@ -184,6 +202,12 @@ n=1
 while [ $n -le 4 ]; do
        CFDIR=${XDIR}$n/slapd.d
        $SLAPCAT -F $CFDIR -b $BASEDN -l $TESTDIR/finaldb-$n.ldif
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapcat failed ($RC)!"
+               exit $RC
+       fi
+
        n=`expr $n + 1`
 done
 

diff --git a/tests/data/regressions/its9051/its9051 b/tests/data/regressions/its9051/its9051
index 93dec80facc43009d6a430aa67be8dfda1018915..f2aad71634cd6d80270ae4ef33c9617a60cfc38d 100755 (executable)
--- a/tests/data/regressions/its9051/its9051
+++ b/tests/data/regressions/its9051/its9051
@@ -38,7 +38,18 @@ echo "Initializing server configuration for provider..."
 mkdir -p ${XDIR} $DBDIR.1 $DBDIR.2 $CFDIR
 . $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 KILLPIDS=
 CFDIR=${XDIR}/slapd.d

diff --git a/tests/data/regressions/its9282/its9282 b/tests/data/regressions/its9282/its9282
index 5c40b1159547c7624b3521f470631d86b1808b2a..e1ca679fbe07c54f18208519b792040dde8fbefe 100755 (executable)
--- a/tests/data/regressions/its9282/its9282
+++ b/tests/data/regressions/its9282/its9282
@@ -56,6 +56,12 @@ while [ $n -le $MMR ]; do
        fi
        sed -e "s/@SID@/$n/g" -e "s|@URI@|$MYURI|g" $TESTDIR/config${n}.ldif > $CONFLDIF
        $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
+       RC=$?
+       if test $RC != 0 ; then
+               echo "slapadd failed ($RC)!"
+               exit $RC
+       fi
+
        n=`expr $n + 1`
 done
 

diff --git a/tests/data/regressions/its9863/its9863 b/tests/data/regressions/its9863/its9863
index 215b28d3590717a02b076903c6f4cdcdd85d97a3..78197e7d4ed8d5e885eb6bb0ab41a0b8abdf0f40 100755 (executable)
--- a/tests/data/regressions/its9863/its9863
+++ b/tests/data/regressions/its9863/its9863
@@ -62,6 +62,12 @@ cp $ITSDIR/db.ldif $TESTDIR
 echo "Running slapadd to build database on the provider..."
 . $CONFFILTER $BACKEND <  $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $PDIR/slapd.d -n 0 -l $CONFLDIF
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPADD -F $PDIR/slapd.d -q -b $BASEDN -l $TESTDIR/db.ldif
 RC=$?
 if test $RC != 0 ; then
@@ -104,6 +110,12 @@ fi
 echo "Starting slapd consumer on TCP/IP port $PORT3 and ${PORT4}..."
 . $CONFFILTER $BACKEND < $ITSDIR/slapd-consumer.ldif > $CONF2
 $SLAPADD -F $CDIR/slapd.d -n 0 -l $CONF2
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
+
 $SLAPD -F $CDIR/slapd.d -h "$URI3 $SURI4" -d $LVL > $LOG2 2>&1 &
 CONSPID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/data/regressions/its9888/its9888 b/tests/data/regressions/its9888/its9888
index e06293e452efe52273548969972b59c605f05abb..abf740004e8ee18aad1c6a99c8595533c593e8c8 100755 (executable)
--- a/tests/data/regressions/its9888/its9888
+++ b/tests/data/regressions/its9888/its9888
@@ -59,6 +59,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 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
@@ -184,6 +190,12 @@ 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)!"
+       exit $RC
+fi
+
 $SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
@@ -446,6 +458,12 @@ sleep 3
 
 echo "Exporting config database for consumer from provider"
 $SLAPCAT -o ldif-wrap=no -F testrun/cfpro.d -b "cn=config,cn=consumer" -l testrun/config-consumer.ldif
+RC=$?
+if test $RC != 0 ; then
+       echo "slapcat failed ($RC)!"
+       exit $RC
+fi
+
 echo "Rewriting config database for loading on consumer"
 cp testrun/config-consumer.ldif testrun/consumer.ldif
 sed -i -e "s/^dn:\(.*\),cn=consumer/dn:\1/" testrun/consumer.ldif
@@ -453,6 +471,11 @@ mv $CFCON $CFCON.orig
 mkdir -p $CFCON
 echo "Reloading config database on consumer"
 $SLAPADD -F $CFCON -n 0 -l testrun/consumer.ldif
+RC=$?
+if test $RC != 0 ; then
+       echo "slapadd failed ($RC)!"
+       exit $RC
+fi
 
 echo "Restarting consumer slapd on TCP/IP port $PORT2..."
 $SLAPD -F $CFCON -h $URI2 -d $LVL >> $LOG2 2>&1 &

diff --git a/tests/scripts/lloadd/test003-cnconfig b/tests/scripts/lloadd/test003-cnconfig
index d5294c5d19dbf24f051bd2491f11596c2a587ec2..5066988e264b7f38afebeda64cc672b89cb92d34 100755 (executable)
--- a/tests/scripts/lloadd/test003-cnconfig
+++ b/tests/scripts/lloadd/test003-cnconfig
@@ -120,6 +120,12 @@ echo "Starting lloadd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $LLOADDUNREACHABLECONF > $CONF1.lloadd
 . $CONFFILTER $BACKEND < $SLAPDLLOADCONF > $CONF1.slapd
 $SLAPD -Tt -f $CONF1.slapd -F $CONF1.d -d $LVL > $LOG1 2>&1
+RC=$?
+if test $RC != 0 ; then
+    echo "slaptest failed ($RC)!"
+    exit $RC
+fi
+
 $SLAPD -F $CONF1.d -h $URI6 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then