svn commit: samba r21521 - in
branches/SAMBA_4_0/source/script/tests/win: .
brad at samba.org
brad at samba.org
Fri Feb 23 18:01:18 GMT 2007
Author: brad
Date: 2007-02-23 18:01:18 +0000 (Fri, 23 Feb 2007)
New Revision: 21521
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21521
Log:
Add missing quotes around shell variables which could have spaces.
Stop passing the VM config file path to wintest_2k3_dc.sh on the command line as it is now properly passed through the environment.
Windows tests, including the DC tests found in test_w2k3.sh should work properly with 'make wintest' and a configured VMware environment.
These tests are executed on build-farm host bnhtest.
Modified:
branches/SAMBA_4_0/source/script/tests/win/wintest_2k3_dc.sh
branches/SAMBA_4_0/source/script/tests/win/wintest_net.sh
branches/SAMBA_4_0/source/script/tests/win/wintest_raw.sh
branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/win/wintest_2k3_dc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/win/wintest_2k3_dc.sh 2007-02-23 13:42:00 UTC (rev 21520)
+++ branches/SAMBA_4_0/source/script/tests/win/wintest_2k3_dc.sh 2007-02-23 18:01:18 UTC (rev 21521)
@@ -8,7 +8,6 @@
fi
TESTGROUP=$1
-export WIN2K3_DC_VM_CFG_PATH="$2"
if [ -z $WINTEST_DIR ]; then
echo "Environment variable WINTEST_DIR not found."
@@ -24,7 +23,7 @@
. $WINTESTCONF
. $WINTEST_DIR/wintest_functions.sh
-WIN2K3_DC_REMOTE_HOST=`perl -I$WINTEST_DIR $WINTEST_DIR/vm_get_ip.pl WIN2K3_DC_VM_CFG_PATH`
+export WIN2K3_DC_REMOTE_HOST=`perl -I$WINTEST_DIR $WINTEST_DIR/vm_get_ip.pl WIN2K3_DC_VM_CFG_PATH`
if [ -z $WIN2K3_DC_REMOTE_HOST ]; then
# Restore snapshot to ensure VM is in a known state, then exit.
@@ -54,12 +53,12 @@
name="RPC-DRSUAPI on ncacn_ip_tcp with seal"
bin/smbtorture \
ncacn_ip_tcp:$server[seal] $OPTIONS \
- RPC-DRSUAPI || on_error $name
+ RPC-DRSUAPI || on_error "$name"
name="RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian"
bin/smbtorture \
ncacn_ip_tcp:$server[seal,bigendian] $OPTIONS \
- RPC-DRSUAPI || on_error $name
+ RPC-DRSUAPI || on_error "$name"
}
spoolss_tests() {
@@ -67,7 +66,7 @@
name="RPC-SPOOLSS on ncacn_np"
bin/smbtorture \
ncacn_np:$server $OPTIONS \
- RPC-SPOOLSS || on_error $name
+ RPC-SPOOLSS || on_error "$name"
}
ncacn_ip_tcp_tests() {
@@ -80,7 +79,7 @@
name="$t on $transport with $bindoptions"
bin/smbtorture $TORTURE_OPTIONS \
$transport:$server[$bindoptions] \
- $OPTIONS $t || on_error $name
+ $OPTIONS $t || on_error "$name"
done
done
}
@@ -95,7 +94,7 @@
name="$t on $transport with $bindoptions"
bin/smbtorture $TORTURE_OPTIONS \
$transport:$server[$bindoptions] \
- $OPTIONS $t || on_error $name
+ $OPTIONS $t || on_error "$name"
done
done
}
Modified: branches/SAMBA_4_0/source/script/tests/win/wintest_net.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/win/wintest_net.sh 2007-02-23 13:42:00 UTC (rev 21520)
+++ branches/SAMBA_4_0/source/script/tests/win/wintest_net.sh 2007-02-23 18:01:18 UTC (rev 21521)
@@ -39,7 +39,7 @@
errstr=$1
all_errs=`expr $all_errs + 1`
- restore_snapshot $errstr "$VM_CFG_PATH"
+ restore_snapshot "$errstr" "$VM_CFG_PATH"
}
for o in $bind_options; do
@@ -52,7 +52,6 @@
for t in $net_test; do
test_name="$t on $transport with $o"
- old_errs=$all_errs
testit "$test_name" $SMBTORTURE_BIN_PATH \
-U $username%$password \
-W $domain \
Modified: branches/SAMBA_4_0/source/script/tests/win/wintest_raw.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/win/wintest_raw.sh 2007-02-23 13:42:00 UTC (rev 21520)
+++ branches/SAMBA_4_0/source/script/tests/win/wintest_raw.sh 2007-02-23 18:01:18 UTC (rev 21521)
@@ -32,7 +32,7 @@
errstr=$1
all_errs=`expr $all_errs + 1`
- restore_snapshot $errstr "$VM_CFG_PATH"
+ restore_snapshot "$errstr" "$VM_CFG_PATH"
}
for t in $raw_tests; do
@@ -57,7 +57,7 @@
remove_share_test
if [ $err_rtn -ne 0 ]; then
# If cleanup fails, restore VM snapshot.
- restore_snapshot "\n$test_name removal failed."
+ on_error "\n$test_name removal failed."
else
echo -e "\n$test_name removal completed successfully."
fi
Modified: branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh 2007-02-23 13:42:00 UTC (rev 21520)
+++ branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh 2007-02-23 18:01:18 UTC (rev 21521)
@@ -42,7 +42,7 @@
errstr=$1
all_errs=`expr $all_errs + 1`
- restore_snapshot $errstr "$VM_CFG_PATH"
+ restore_snapshot "$errstr" "$VM_CFG_PATH"
}
for o in $bind_options; do
More information about the samba-cvs
mailing list