From 48b0dabdbaf7538e0896dd137eec5cc97b50a59d Mon Sep 17 00:00:00 2001 From: Brad Henry Date: Wed, 21 Feb 2007 22:50:55 +0000 Subject: r21494: Fix 'make wintest' to support command-line changes to 'vm-get-ip.pl' and the revertsnapshot() shell function. Restructure existing tests to work with the recent build farm changes. Added windows DC testing to 'make wintest'. Some improvements and generalization to the way errors are handled. (This used to be commit de9687404e802d7e7629c9d03f496d3c5bd30397) --- source4/script/tests/win/wintest_client.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/script/tests/win/wintest_client.sh') diff --git a/source4/script/tests/win/wintest_client.sh b/source4/script/tests/win/wintest_client.sh index cd6427a0bd..42fbc5c805 100755 --- a/source4/script/tests/win/wintest_client.sh +++ b/source4/script/tests/win/wintest_client.sh @@ -7,20 +7,20 @@ # This variable is defined in the per-hosts .fns file. . $WINTESTCONF +export SMBTORTURE_REMOTE_HOST=$1 + test_name="WINDOWS CLIENT / SAMBA SERVER SHARE" cat $WINTEST_DIR/common.exp > $TMPDIR/client_test.exp cat $WINTEST_DIR/wintest_client.exp >> $TMPDIR/client_test.exp -testit "$test_name" \ - expect $TMPDIR/client_test.exp || all_errs=`expr $all_errs + 1` +expect $TMPDIR/client_test.exp || all_errs=`expr $all_errs + 1` if [ $all_errs > 0 ]; then # Restore snapshot to ensure VM is in a known state. - restore_snapshot "\n$test_name failed." - echo "Snapshot restored." + restore_snapshot "\n$test_name failed." "$VM_CFG_PATH" fi rm -f $TMPDIR/client_test.exp -testok $0 $all_errs +exit $all_errs -- cgit