summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-08-24 01:03:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:38 -0500
commitb075bb842d6665be3212ddf93d4ccb98472f341a (patch)
tree7b6065a16bbc5f91e8cfe67e65e6127dc51d76b9 /source4
parent18f93fce20162662ec16d4914320c7c6b6435ae1 (diff)
downloadsamba-b075bb842d6665be3212ddf93d4ccb98472f341a.tar.gz
samba-b075bb842d6665be3212ddf93d4ccb98472f341a.tar.bz2
samba-b075bb842d6665be3212ddf93d4ccb98472f341a.zip
r17765: fix handling of old solaris /bin/sh in ldb build/test
(This used to be commit f41d3ed4b3d76c37c9c5bfd15e9e4e27179450f0)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/lib/ldb/docs/builddocs.sh2
-rwxr-xr-xsource4/lib/ldb/tests/test-generic.sh3
-rwxr-xr-xsource4/lib/ldb/tests/test-ldap.sh9
3 files changed, 9 insertions, 5 deletions
diff --git a/source4/lib/ldb/docs/builddocs.sh b/source4/lib/ldb/docs/builddocs.sh
index b071f0f954..64835c9efe 100755
--- a/source4/lib/ldb/docs/builddocs.sh
+++ b/source4/lib/ldb/docs/builddocs.sh
@@ -5,7 +5,7 @@
XSLTPROC="$1"
SRCDIR="$2"
-if ! test -x "$XSLTPROC"; then
+if [ -z "$XSLTPROC" ] || [ ! -x "$XSLTPROC" ]; then
echo "xsltproc not installed"
exit 0
fi
diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh
index 363bf89065..1f81723d5e 100755
--- a/source4/lib/ldb/tests/test-generic.sh
+++ b/source4/lib/ldb/tests/test-generic.sh
@@ -1,7 +1,8 @@
#!/bin/sh
if [ -z "$LDB_SPECIALS" ]; then
- export LDB_SPECIALS=1
+ LDB_SPECIALS=1
+ export LDB_SPECIALS
fi
echo "LDB_URL: $LDB_URL"
diff --git a/source4/lib/ldb/tests/test-ldap.sh b/source4/lib/ldb/tests/test-ldap.sh
index e2ce81c99f..63e93e0fb0 100755
--- a/source4/lib/ldb/tests/test-ldap.sh
+++ b/source4/lib/ldb/tests/test-ldap.sh
@@ -1,6 +1,7 @@
#!/bin/sh
-export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
+PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
+export PATH
SCHEMA_NEEDED="core nis cosine inetorgperson openldap"
# setup needed schema files
@@ -29,7 +30,8 @@ if [ -z "$LDBDIR" ]; then
export LDBDIR
fi
-export LDB_URL=`$LDBDIR/tests/ldapi_url.sh`
+LDB_URL=`$LDBDIR/tests/ldapi_url.sh`
+export LDB_URL
PATH=bin:$PATH
export PATH
@@ -37,5 +39,6 @@ export PATH
. $LDBDIR/tests/init_slapd.sh
. $LDBDIR/tests/start_slapd.sh
-export LDB_SPECIALS=0
+LDB_SPECIALS=0
+export LDB_SPECIALS
. $LDBDIR/tests/test-generic.sh