diff options
| author | Brad Henry <brad@samba.org> | 2007-02-23 18:01:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:48:50 -0500 |
| commit | 74e23c7e7a6ab10833a6cf618fa9ecb4f05f0c18 (patch) | |
| tree | 24b36018ca33c8e20c080fed1ae73815ff68f34b /source4/script/tests/win/wintest_2k3_dc.sh | |
| parent | 067d8fd44ce4ab3ccaab654591efd2742ef3a4c0 (diff) | |
| download | samba-74e23c7e7a6ab10833a6cf618fa9ecb4f05f0c18.tar.gz samba-74e23c7e7a6ab10833a6cf618fa9ecb4f05f0c18.tar.bz2 samba-74e23c7e7a6ab10833a6cf618fa9ecb4f05f0c18.zip | |
r21521: 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.
(This used to be commit 7496a28b4388535a426ca753bc9000670f6e42e1)
Diffstat (limited to 'source4/script/tests/win/wintest_2k3_dc.sh')
| -rwxr-xr-x | source4/script/tests/win/wintest_2k3_dc.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source4/script/tests/win/wintest_2k3_dc.sh b/source4/script/tests/win/wintest_2k3_dc.sh index c6e9c96321..ed964a274a 100755 --- a/source4/script/tests/win/wintest_2k3_dc.sh +++ b/source4/script/tests/win/wintest_2k3_dc.sh @@ -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 } |