summaryrefslogtreecommitdiff
path: root/source4/script/tests/win/wintest_raw.sh
diff options
context:
space:
mode:
authorBrad Henry <brad@samba.org>2007-02-23 18:01:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:48:50 -0500
commit74e23c7e7a6ab10833a6cf618fa9ecb4f05f0c18 (patch)
tree24b36018ca33c8e20c080fed1ae73815ff68f34b /source4/script/tests/win/wintest_raw.sh
parent067d8fd44ce4ab3ccaab654591efd2742ef3a4c0 (diff)
downloadsamba-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_raw.sh')
-rwxr-xr-xsource4/script/tests/win/wintest_raw.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/script/tests/win/wintest_raw.sh b/source4/script/tests/win/wintest_raw.sh
index f974dc8770..9194343153 100755
--- a/source4/script/tests/win/wintest_raw.sh
+++ b/source4/script/tests/win/wintest_raw.sh
@@ -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