Added optional 3rd parameter, to make the script display the slapd pid

and wait. User must hit <NewLine> to continue. This gives the opportunity
to attach a debugger to the slapd before proceeding with the test.

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index fd10f7a0a3cc32bc013ac13e00f078b2e1757f85..54d075e7322dc7f5a1a4eb981db6188c47bc8985 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -10,6 +10,11 @@ if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
 
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
+
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
@@ -23,6 +28,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $SCHEMACONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index b883d8050b93aa6c562e341981a2969f61b89ddc..269829debc8a261657db55bfdea6abfc95605944 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -32,6 +36,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $CONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
@@ -59,6 +67,8 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - database was not created correctly"
+       echo $SEARCHFLT $LDIFFLT
+       diff -u $SEARCHFLT $LDIFFLT
        exit 1
 fi
 

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index c86c3e794aa415e6f3b6982ce7d4b4971da6534e..d069e075361f064f151a33dc041d54b7264e5f58 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -21,6 +25,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $CONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 68cd8fd107b8751cbd2a2c9a532d4aa68f90907e..c73254a863519d86324f84ce9dd78162afd0680a 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -38,6 +42,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 2f8caae10542b42eca6e7580a3ad5680231423ed..32427f08e8678199c17952f80a5f63937087dbdb 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -32,6 +36,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Testing slapd modify operations..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 11f2fca755d60eb12a9a0a7bfdaae3f0f6d44f3a..0accc7c4b39fed09af1b9c9884d21ae9e85477a9 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -29,6 +33,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 echo "Testing slapd modrdn operations..."
 
 # Make sure we can search the database

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index ffcc43c3205857aa15f600ecabf4cbe234f3b4eb..5a97ccc53168471e14f3e15dec11c729c8bea7da 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -29,6 +33,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Testing slapd access control..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 850052f87d0fd4ee2a25434c1d8b962989512fcf..e17a14f7f7e407ffeec5c4e1c886e32f235070e8 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -38,11 +42,19 @@ echo "Starting master slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $MASTERCONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
 . $CONFFILTER $BACKEND < $SLAVECONF > $REPLCONF
 $SLAPD -f $REPLCONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
+if test $WAIT != 0 ; then
+    echo SLAVEPID $SLAVEPID
+    read foo
+fi
 
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index a3ff6ae7b7a1fa026e0d51d99b1487177b47600b..24f1722901293a40804a40ad1bab9bf8c2b2c867 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -34,6 +38,10 @@ sleep 5
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 88f3e5bec3dac07add15fd2545bd7ad41053909e..09b47df8775a610cb1804c8ebfded8dfd2e8e7ed 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -35,11 +39,19 @@ fi
 echo "Starting master slapd on TCP/IP port $PORT..."
 $SLAPD -n master -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
 . $CONFFILTER $BACKEND < $REFSLAVECONF > $REPLCONF
 $SLAPD -n slave -f $REPLCONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
+if test $WAIT != 0 ; then
+    echo SLAVEPID $SLAVEPID
+    read foo
+fi
 
 echo "Testing for master slapd..."
 for i in 0 1 2 3 4 5; do

diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 593a2de8ade20f52c219e620dde9f8c44f8b32be..080063c709e3c7dede8b0b2ca6ad791ba36dec5b 100755 (executable)
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
        BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+       WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -21,6 +25,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $PWCONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do