Import slurpd test fix (to skip test when slurpd doesn't exist)

and update README/INSTALL with latest from -devel.

diff --git a/INSTALL b/INSTALL
index aeaeb02b5a4eb39aca82fba907f5c4fdc65b2654..c679fe2c68ae325dae2ce380c03d8f1ac8fbf11c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -64,21 +64,41 @@ these steps:
        % make
 
     If all goes well, the system will build as configured.  If not,
-       return to step 4 after reviewing the enable/with options settings.
-       
- 7. install the binaries and man pages.  You may need to be superuser to
+       return to step 4 after reviewing the configuration settings.
+
+       You may want to consult the doc/install/hints file for your
+       platform.
+
+ 7. Test the standalone system
+
+       This step requires the standalone LDAP server (slapd) with
+       LDBM support.
+
+       % cd tests
+       % make
+
+       If all goes well, the system has been built as configured.  If not,
+       return to step 4 after reviewing your configuration settings.
+
+       You may want to consult the doc/install/hints file for your
+       platform.
+
+ 8. install the binaries and man pages.  You may need to be superuser to
     do this (depending on where you are installing things):
 
        % su
        # make install
 
-    That's it!  See the man pages for the individual clients for information
-    on configuring and using them.  Eventually you will probably want to
-    edit the configuration files used by the various clients (installed in
-    the LDAP etc directory).  The files are:
+    That's it!
 
+       See the man pages for the individual applications for
+       information on configuring and using them.  You may also want
+       to edit the configuration files used by the various clients.
+       These configuration files are located in the OpenLDAP
+       configuration directory (normally /usr/local/etc/openldap).
+
+       ldap.conf            - LDAP defaults
        ldapfilter.conf      - search filter configuration
-       ldapfriendly         - mapping of X.500 names to human-friendly names
        ldapsearchprefs.conf - search object definitions
        ldaptemplates.conf   - display template definitions
 
@@ -126,10 +146,11 @@ variables for determining compiler/linker options.   This can
 be used to manual specify features and compilation options.
 
 Supported Environmental Variables
-       CC                      C Compiler              (cc, ecgs)
-       CFLAGS          C Flags                 (-ansi)
-       CPPFLAGS        CPP Flags               (-I/path/include -Ddef)
-       LDFLAGS         LDFLAGS                 (-L/path/lib -llib)
+       CC                      C compiler              (cc, egcc)
+       CFLAGS          C flags                 (-ansi)
+       CPPFLAGS        cpp flags               (-I/path/include -Ddef)
+       LDFLAGS         ld flags                (-s)
+       LIBS            libraries               (-L/usr/local/lib -llib)
        PATH            command path    /usr/local/bin:/usr/bin:/bin
 
 * Including alternative compilers
@@ -137,7 +158,7 @@ Supported Environmental Variables
        use a specific compiler.  For example, to use ecgs
        instead of the compiler configure choose, use:
 
-       [env] CC=ecgs ./configure 
+       [env] CC=egcc ./configure 
 
        You can also use CC use specific flags with the
        specified compiler.  For example, to require strict
@@ -179,7 +200,9 @@ Supported Environmental Variables
 
 HINTS
 
-* use software under installed in /usr/local/{include,lib}
+* Platform specific hints are available in doc/install/hints.
+
+* Use software under installed in /usr/local/{include,lib}
        [env] \
                CPPFLAGS="-I/usr/local/include" \
                LDFLAGS="-L/usr/local/lib" \

diff --git a/README b/README
index 6a979619a59a78da92e9ee9e89e96a6f7dd8b8a0..fc2eb532a82633d5df8ff1fc6a34d2e30c1c2ee5 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,5 @@
-OpenLDAP 1.1 Alpha README
-
-    This is the OpenLDAP version 1.1 Alpha.
+OpenLDAP 1.1 Beta README
+       This is the OpenLDAP version 1.1 Beta.
 
        For a description of what this distribution contains, see the
        ANNOUNCEMENT file in this directory.  For a description of
@@ -41,17 +40,7 @@ MAKING AND INSTALLING THE DISTRIBUTION
        This is a quick guide.  For details, see the INSTALL file.
 
        % ./configure
-               autoconf OpenLDAP for current platform
-
-       % ./configure --help
-               This will list the available options.
-               The configure script will also use your environmental
-               variables for determining compiler/linker options.
-               These environment variables are used:
-                       CC                      C compiler      (cc, ecgs)
-                       CFLAGS          C Flags         (-ansi)
-                       CPPFLAGS        CPP Flags       (-I -D)
-                       LDFLAGS         LDFLAGS         (-L -l)
+               configure OpenLDAP for current platform
 
        % [env settings] ./configure [options]
                this will configure the build system
@@ -68,13 +57,6 @@ MAKING AND INSTALLING THE DISTRIBUTION
     in this directory.  This should produce something that basically
     works.  You can "cd tests; make" to verify the build.
 
-    You will probably want to do a little configuration to suit your
-    site, though.  There are one file you might want to edit:
-
-       include/ldapconfig.h.edit
-               This file contains #defines used by many parts of the
-               distribution.  You'll at least want to change DEFAULT_BASE.
-
     See the INSTALL file in this directory for more information.
 
 

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index c0f49136c5c7e5413ed7df90d740ddf0ef4ffbf9..10190728fc044468f7868b78f6c7f97c7543ffdf 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -12,17 +12,23 @@
 
 . scripts/defines.sh
 
+if test ! -x $SLURPD ; then
+       echo ">>>>> $SLURPD is not executable or do not exist."
+       echo ">>>>> Test skipped."
+       exit 0
+fi
+
 echo "Cleaning up in $DBDIR..."
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 echo "Cleaning up in $REPLDIR..."
-rm -f $REPLDIR/*
+rm -f $REPLDIR/[!C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $MASTERCONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $MASTERCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
-$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > $SLAVELOG 2>&1 &
 SLAVEPID=$!
 
 echo "Using ldapsearch to check that master slapd is running..."
@@ -48,7 +54,7 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Starting slurpd..."
-$SLURPD -f $MASTERCONF -d 4 -t $REPLDIR > /dev/null 2>&1 &
+$SLURPD -f $MASTERCONF -d 4 -t $REPLDIR > $SLURPLOG 2>&1 &
 SLURPPID=$!
 
 echo "Using ldapmodify to populate the database..."
@@ -123,8 +129,8 @@ changetype: delete
 
 EOMODS
 
-echo "Waiting 10 seconds for slurpd to send changes..."
-sleep 10
+echo "Waiting 15 seconds for slurpd to send changes..."
+sleep 15
 
 echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \