summaryrefslogtreecommitdiff
path: root/source4/script/tests
diff options
context:
space:
mode:
Diffstat (limited to 'source4/script/tests')
-rwxr-xr-xsource4/script/tests/selftest.sh10
-rwxr-xr-xsource4/script/tests/test_echo.sh3
-rw-r--r--source4/script/tests/tests_all.sh18
-rw-r--r--source4/script/tests/tests_quick.sh8
4 files changed, 22 insertions, 17 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index e24d1f27dc..fc35e797f9 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -7,6 +7,7 @@ REALM=SAMBA.EXAMPLE.COM
PASSWORD=penguin
SRCDIR=`pwd`
ROOT=$USER
+SERVER=localtest
if test -z "$ROOT"; then
ROOT=$LOGNAME
fi
@@ -81,7 +82,7 @@ mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR
cat >$CONFFILE<<EOF
[global]
- netbios name = LOCALHOST
+ netbios name = $SERVER
workgroup = $DOMAIN
realm = $REALM
private dir = $PRIVATEDIR
@@ -107,7 +108,7 @@ cat >$CONFFILE<<EOF
[cifs]
read only = no
ntvfs handler = cifs
- cifs:server = localhost
+ cifs:server = $SERVER
cifs:user = $USERNAME
cifs:password = $PASSWORD
cifs:domain = $DOMAIN
@@ -134,7 +135,8 @@ EOF
export KRB5_CONFIG
-./setup/provision $CONFIGURATION --quiet --domain $DOMAIN --realm $REALM \
+./setup/provision $CONFIGURATION --host-name=$SERVER --host-ip=127.0.0.1 \
+ --quiet --domain $DOMAIN --realm $REALM \
--adminpass $PASSWORD --root=$ROOT || exit 1
if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
@@ -153,7 +155,7 @@ START=`date`
# give time for nbt server to register its names
echo delaying for nbt name registration
sleep 4
- bin/nmblookup $CONFIGURATION -U localhost localhost
+ bin/nmblookup $CONFIGURATION -U $SERVER $SERVER
failed=0
diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh
index bfd8cdf4b6..2f22e52af3 100755
--- a/source4/script/tests/test_echo.sh
+++ b/source4/script/tests/test_echo.sh
@@ -20,6 +20,9 @@ transports="ncacn_np ncacn_ip_tcp"
if [ $server = "localhost" ]; then
transports="ncalrpc $transports"
fi
+if [ $server = "localtest" ]; then
+ transports="ncalrpc $transports"
+fi
failed=0
for transport in $transports; do
diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh
index 41c711b50b..5c480e9995 100644
--- a/source4/script/tests/tests_all.sh
+++ b/source4/script/tests/tests_all.sh
@@ -1,10 +1,10 @@
- $SRCDIR/script/tests/test_ejs.sh localhost $USERNAME $PASSWORD || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_ldap.sh localhost $USERNAME $PASSWORD || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_nbt.sh localhost || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_quick.sh //localhost/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_rpc.sh localhost $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_session_key.sh localhost $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_binding_string.sh localhost $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_echo.sh localhost $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
- $SRCDIR/script/tests/test_posix.sh //localhost/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_ejs.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_nbt.sh $SERVER || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
$SRCDIR/script/tests/test_local.sh || failed=`expr $failed + $?`
diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
index e03b1e00ce..f5df436ab9 100644
--- a/source4/script/tests/tests_quick.sh
+++ b/source4/script/tests/tests_quick.sh
@@ -1,5 +1,5 @@
-$SRCDIR/script/tests/test_ejs.sh localhost $USERNAME $PASSWORD || failed=`expr $failed + $?`
-$SRCDIR/script/tests/test_ldap.sh localhost $USERNAME $PASSWORD || failed=`expr $failed + $?`
-$SRCDIR/script/tests/test_nbt.sh localhost || failed=`expr $failed + $?`
-$SRCDIR/script/tests/test_quick.sh //localhost/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+$SRCDIR/script/tests/test_ejs.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+$SRCDIR/script/tests/test_nbt.sh $SERVER || failed=`expr $failed + $?`
+$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?`