sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r21521: Add missing quotes around shell variables which could have spaces.

Browse Source 
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.
(This used to be commit 7496a28b43)
This commit is contained in:
Brad Henry 2007-02-23 18:01:18 +00:00 committed by Gerald (Jerry) Carter
parent 067d8fd44c
commit 74e23c7e7a
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/script/tests/win/wintest_2k3_dc.sh
View File

@ -8,7 +8,6 @@ exit 1;
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 @@ fi
. $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 @@ drsuapi_tests() {
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 @@ spoolss_tests() {
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 @@ ncacn_ip_tcp_tests() {
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 @@ ncacn_np_tests() {
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
}

3
source4/script/tests/win/wintest_net.sh
View File

@ -39,7 +39,7 @@ on_error() {
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 o in $bind_options; do
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 \

4
source4/script/tests/win/wintest_raw.sh
View File

@ -32,7 +32,7 @@ on_error() {
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 @@ for t in $raw_tests; do
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

2
source4/script/tests/win/wintest_rpc.sh
View File

@ -42,7 +42,7 @@ on_error() {
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