Rev 11670: Run mktestsetup as an external program. This guarantees
that it can be used for other selftest implementations (in
particular the perl one I've been working on). in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Mon Mar 5 13:45:40 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11670
revision-id: jelmer at samba.org-20070305134503-0453qms203jizd4r
parent: svn-v2:21699 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Mon 2007-03-05 14:45:03 +0100
message:
Run mktestsetup as an external program. This guarantees that it can be used for other selftest implementations (in particular the perl one I've been working on).
modified:
source/script/tests/mktestsetup.sh svn-v2:16522 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fmktestsetup.sh
source/script/tests/selftest.sh svn-v2:6564 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fselftest.sh
source/script/tests/test_ejs.sh svn-v2:8269 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_ejs.sh
source/script/tests/test_ldap.sh svn-v2:6549 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_ldap.sh
source/script/tests/tests_all.sh svn-v2:8525 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftests_all.sh
source/script/tests/tests_quick.sh svn-v2:8525 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftests_quick.sh
testprogs/blackbox/test_ldb.sh svn-v2:21017 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-testprogs%2fblackbox%2ftest_ldb.sh
=== modified file 'source/script/tests/mktestsetup.sh'
--- a/source/script/tests/mktestsetup.sh 2007-03-04 23:55:43 +0000
+++ b/source/script/tests/mktestsetup.sh 2007-03-05 13:45:03 +0000
@@ -1,4 +1,5 @@
#!/bin/sh
+# Build a test environment for running Samba
if [ $# -lt 1 ]
then
@@ -39,11 +40,9 @@
mkdir -p $PREFIX || exit $?
cd $PREFIX
PREFIX_ABS=`pwd`
-export PREFIX_ABS
cd $oldpwd
TEST_DATA_PREFIX=$PREFIX_ABS
-export TEST_DATA_PREFIX
TMPDIR=$PREFIX_ABS/tmp
ETCDIR=$PREFIX_ABS/etc
@@ -58,13 +57,6 @@
CONFIGURATION="--configfile=$CONFFILE"
LDAPDIR=$PREFIX_ABS/ldap
-export CONFIGURATION
-export CONFFILE
-export PIDDIR
-export AUTH
-export SERVER
-export NETBIOSNAME
-
rm -rf $PREFIX/*
mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $LDAPDIR/db $LDAPDIR/db/bdb-logs $LDAPDIR/db/tmp
@@ -239,7 +231,6 @@
[domain_realm]
.samba.example.com = SAMBA.EXAMPLE.COM
EOF
-export KRB5_CONFIG
. `dirname $0`/mk-keyblobs.sh
@@ -301,11 +292,7 @@
echo "DNSNAME=$DNSNAME"
echo "BASEDN=$BASEDN"
echo "PASSWORD=$PASSWORD"
-echo "AUTH=$AUTH"
echo "SRCDIR=$SRCDIR"
-echo "ROOT=$ROOT"
-echo "SERVER=$SERVER"
-echo "NETBIOSNAME=$NETBIOSNAME"
echo "PREFIX=$PREFIX"
echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
echo "LDAPDIR=$LDAPDIR"
=== modified file 'source/script/tests/selftest.sh'
--- a/source/script/tests/selftest.sh 2007-03-02 09:16:26 +0000
+++ b/source/script/tests/selftest.sh 2007-03-05 13:45:03 +0000
@@ -52,9 +52,19 @@
incdir=`dirname $ARG0`
echo -n "PROVISIONING..."
-. $incdir/mktestsetup.sh $PREFIX >/dev/null || exit 1
+eval `$incdir/mktestsetup.sh $PREFIX || exit 1`
echo "DONE"
+export KRB5_CONFIG
+export PREFIX_ABS
+export TEST_DATA_PREFIX
+export CONFIGURATION
+export CONFFILE
+export PIDDIR
+export AUTH
+export SERVER
+export NETBIOSNAME
+
PATH=bin:$PATH
export PATH
=== modified file 'source/script/tests/test_ejs.sh'
--- a/source/script/tests/test_ejs.sh 2007-01-26 13:33:06 +0000
+++ b/source/script/tests/test_ejs.sh 2007-03-05 13:45:03 +0000
@@ -3,7 +3,7 @@
if [ $# -lt 3 ]; then
cat <<EOF
-Usage: test_ejs.sh DOMAIN USERNAME PASSWORD
+Usage: test_ejs.sh DOMAIN USERNAME PASSWORD [OPTIONS]
EOF
exit 1;
fi
@@ -11,6 +11,8 @@
DOMAIN="$1"
USERNAME="$2"
PASSWORD="$3"
+shift 3
+CONFIGURATION="$*"
incdir=`dirname $0`
. $incdir/test_functions.sh
=== modified file 'source/script/tests/test_ldap.sh'
--- a/source/script/tests/test_ldap.sh 2007-03-05 00:18:38 +0000
+++ b/source/script/tests/test_ldap.sh 2007-03-05 13:45:03 +0000
@@ -18,13 +18,13 @@
p=ldap
for options in "" "--option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD --option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD"; do
- testit "TESTING PROTOCOL $p with options $options" ../testprogs/blackbox/test_ldb.sh $p $options
+ testit "TESTING PROTOCOL $p with options $options" ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
done
# see if we support ldaps
if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then
p=ldaps
for options in "" "-U$USERNAME%$PASSWORD"; do
- testit "TESTING PROTOCOL $p with options $options" ../testprogs/blackbox/test_ldb.sh $p $options
+ testit "TESTING PROTOCOL $p with options $options" ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
done
fi
for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATENESS
=== modified file 'source/script/tests/tests_all.sh'
--- a/source/script/tests/tests_all.sh 2007-03-03 02:06:54 +0000
+++ b/source/script/tests/tests_all.sh 2007-03-05 13:45:03 +0000
@@ -1,10 +1,10 @@
#!/bin/sh
- $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD
+ $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME
+ $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD $CONFIGURATION
$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_nbt.sh $SERVER
$SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN
- $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME
$SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD ""
=== modified file 'source/script/tests/tests_quick.sh'
--- a/source/script/tests/tests_quick.sh 2007-01-14 03:18:04 +0000
+++ b/source/script/tests/tests_quick.sh 2007-03-05 13:45:03 +0000
@@ -4,7 +4,7 @@
TORTURE_QUICK="yes"
export TORTURE_QUICK
-$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD
+$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD $CONFIGURATION
$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_nbt.sh $SERVER
$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD ""
=== modified file 'testprogs/blackbox/test_ldb.sh'
--- a/testprogs/blackbox/test_ldb.sh 2007-01-25 12:39:13 +0000
+++ b/testprogs/blackbox/test_ldb.sh 2007-03-05 13:45:03 +0000
@@ -1,7 +1,8 @@
#!/bin/sh
p=$1
-shift 1
+SERVER=$2
+shift 2
options="$*"
check() {
More information about the samba-cvs
mailing list