cleanup testers

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 7118fb6b0fb251d8e93a9f5a2d5c87ae7fd368aa..5ede6aa934d48bb4c7f2187ea535e23b80540803 100644 (file)
--- a/tests/progs/slapd-bind.c
+++ b/tests/progs/slapd-bind.c
@@ -391,7 +391,7 @@ novals:;
                return 1;
        }
 
-       fprintf( stderr, "PID=%ld - got %d values.\n", (long) pid, ndns );
+       fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, ndns );
 
        /* Ok, got list of RDNs, now start binding to each */
        for ( i = 0; i < maxloop; i++ ) {
@@ -425,8 +425,8 @@ novals:;
        end = GetTickCount();
        end -= beg;
 
-       fprintf( stderr, "Done %d Binds in %d.%03d seconds.\n", i,
-               end / 1000, end % 1000 );
+       fprintf( stderr, " PID=%ld - Bind done %d in %d.%03d seconds.\n",
+               (long) pid, i, end / 1000, end % 1000 );
 #else
        gettimeofday( &end, NULL );
        end.tv_usec -= beg.tv_usec;
@@ -436,8 +436,8 @@ novals:;
        }
        end.tv_sec -= beg.tv_sec;
 
-       fprintf( stderr, "Done %d Binds in %ld.%06ld seconds.\n", i,
-               (long) end.tv_sec, (long) end.tv_usec );
+       fprintf( stderr, " PID=%ld - Bind done %d in %ld.%06ld seconds.\n",
+               (long) pid, i, (long) end.tv_sec, (long) end.tv_usec );
 #endif
 
        if ( dns ) {

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index c94878acee718b52a15e703f749b20a80b30c645..dc67d5ad773b406396ab2c8ddbeaeb88e32febce 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -261,7 +261,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
                ldap_msgfree( res );
 
                if ( do_retry == maxretries ) {
-                       fprintf( stderr, "PID=%ld - got %d values.\n", (long) pid, nvalues );
+                       fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, nvalues );
                }
 
                for ( i = 0; i < innerloop; i++ ) {

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 51d0ff2d7d36241ab3d56e06c6cf3c557150d402..d9407e9fe4dd3061ba34b5025867daadf168e9a7 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -279,7 +279,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
                ldap_msgfree( res );
 
                if ( do_retry == maxretries ) {
-                       fprintf( stderr, "PID=%ld - got %d values.\n", (long) pid, nvalues );
+                       fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, nvalues );
                }
 
                for ( i = 0; i < innerloop; i++ ) {

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index 13cbc00d50858681dd94574bb48ed6904e67270a..ad773a6ea084ff94b9d99dd2a348406232bcd7c6 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -643,14 +643,14 @@ main( int argc, char **argv )
 
                        bargs[banum - 4] = breqs[jj];
                        bargs[banum - 2] = bcreds[jj];
+                       bargs[banum - 1] = NULL;
                        if ( battrs[jj] != NULL ) {
+                               bargs[banum - 5] = "-b";
                                bargs[banum - 1] = "-a";
                                bargs[banum] = battrs[jj];
-
-                       } else {
-                               sargs[sanum - 1] = NULL;
                        }
                        fork_child( bcmd, bargs );
+                       bargs[banum - 5] = "-D";
                }
        }