svn commit: samba r19474 - in branches/SAMBA_4_0/source/script/tests: . win

[brad at samba.org]

Author: brad
Date: 2006-10-24 01:40:15 +0000 (Tue, 24 Oct 2006)
New Revision: 19474

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19474

Log:
Move the Samba server / Windows client test to its own script.


Added:
   branches/SAMBA_4_0/source/script/tests/win/wintest_client.sh
Modified:
   branches/SAMBA_4_0/source/script/tests/test_win.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_win.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_win.sh	2006-10-24 01:29:02 UTC (rev 19473)
+++ branches/SAMBA_4_0/source/script/tests/test_win.sh	2006-10-24 01:40:15 UTC (rev 19474)
@@ -7,13 +7,6 @@
 # Copyright Brad Henry <brad at samba.org> 2006
 # Released under the GNU GPL v2 or later.
 
-. script/tests/test_functions.sh
-
-. script/tests/wintest_functions.sh
-
-# This variable is defined in the per-hosts .fns file.
-. $WINTESTCONF
-
 # Index variable to count the total number of tests which fail.
 all_errs=0
 
@@ -40,19 +33,6 @@
 	$SMBTORTURE_PASSWORD $SMBTORTURE_WORKGROUP \
 	|| all_errs=`expr $all_errs + $?`
 
-test_name="WINDOWS CLIENT / SAMBA SERVER SHARE"
-old_errs=$all_errs
-cat $WINTEST_DIR/common.exp > $TMPDIR/client_test.exp
-cat $WINTEST_DIR/wintest_client.exp >> $TMPDIR/client_test.exp
+$WINTEST_DIR/wintest_client.sh || all_errs=`expr $all_errs + $?`
 
-testit "$test_name" \
-	expect $TMPDIR/client_test.exp || all_errs=`expr $all_errs + 1`
-
-if [ $old_errs -lt $all_errs ]; then
-	# Restore snapshot to ensure VM is in a known state.
-	restore_snapshot "\n$test_name failed."
-	echo "Snapshot restored."
-fi
-rm -f $TMPDIR/client_test.exp
-
 testok $0 $all_errs

Added: branches/SAMBA_4_0/source/script/tests/win/wintest_client.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/win/wintest_client.sh	2006-10-24 01:29:02 UTC (rev 19473)
+++ branches/SAMBA_4_0/source/script/tests/win/wintest_client.sh	2006-10-24 01:40:15 UTC (rev 19474)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. script/tests/test_functions.sh
+
+. script/tests/win/wintest_functions.sh
+
+# This variable is defined in the per-hosts .fns file.
+. $WINTESTCONF
+
+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`
+
+if [ $all_errs -gt 0 ]; then
+	# Restore snapshot to ensure VM is in a known state.
+	restore_snapshot "\n$test_name failed."
+	echo "Snapshot restored."
+fi
+
+rm -f $TMPDIR/client_test.exp
+
+testok $0 $all_errs


Property changes on: branches/SAMBA_4_0/source/script/tests/win/wintest_client.sh
___________________________________________________________________
Name: svn:executable
   + *