r19281: Generalize what we do for the RAW-QFILEINFO test call so that the same process

is used for other tests that operate on a share when run against windows.
(This used to be commit 3d0cadb303fe9db49289d300a1c9fca44eee9d33)

1 files changed, 31 insertions, 24 deletions

diff --git a/source4/script/tests/test_win.sh b/source4/script/tests/test_win.sh
index e61b924aea..071336e856 100755
--- a/source4/script/tests/test_win.sh
+++ b/source4/script/tests/test_win.sh
@@ -56,37 +56,44 @@ if [ -z $SMBTORTURE_REMOTE_HOST ]; then
 	exit 1
 fi
 
-test_name="RAW-QFILEINFO / WINDOWS SERVER"
-echo -e "\n$test_name SETUP PHASE"
+share_tests="BASE-UNLINK BASE-ATTR BASE-DELETE BASE-TCON BASE-OPEN BASE-CHKPATH"
+share_tests="$share_tests RAW-QFILEINFO RAW-SFILEINFO RAW-MKDIR RAW-SEEK"
+share_tests="$share_tests RAW-OPEN RAW-WRITE RAW-UNLINK RAW-READ RAW-CLOSE"
+share_tests="$share_tests RAW-IOCTL RAW-RENAME RAW-EAS RAW-STREAMS"
 
-setup_share_test
+for t in $share_tests; do
+	test_name="$t / WINDOWS SERVER"
+	echo -e "\n$test_name SETUP PHASE"
 
-if [ $err_rtn -ne 0 ]; then
-	# If test setup fails, load VM snapshot and skip test.
-	restore_snapshot "\n$test_name setup failed, skipping test."
-else
-	echo -e "\n$test_name setup completed successfully."
-	old_errs=$all_errs
+	setup_share_test
 
-	testit "$test_name" $SMBTORTURE_BIN_PATH \
-		-U $SMBTORTURE_USERNAME%$SMBTORTURE_PASSWORD \
-		-d 10 -W $SMBTORTURE_WORKGROUP \
-		//$SMBTORTURE_REMOTE_HOST/$SMBTORTURE_REMOTE_SHARE_NAME \
-		RAW-QFILEINFO || all_errs=`expr $all_errs + 1`
-	if [ $old_errs -lt $all_errs ]; then
-		# If test fails, load VM snapshot and skip cleanup.
-		restore_snapshot "\n$test_name failed."
+	if [ $err_rtn -ne 0 ]; then
+		# If test setup fails, load VM snapshot and skip test.
+		restore_snapshot "\n$test_name setup failed, skipping test."
 	else
-		echo -e "\n$test_name CLEANUP PHASE"
-		remove_share_test
-		if [ $err_rtn -ne 0 ]; then
-			# If cleanup fails, restore VM snapshot.
-			restore_snapshot "\n$test_name removal failed."
+		echo -e "\n$test_name setup completed successfully."
+		old_errs=$all_errs
+
+		testit "$test_name" $SMBTORTURE_BIN_PATH \
+			-U $SMBTORTURE_USERNAME%$SMBTORTURE_PASSWORD \
+			-d 10 -W $SMBTORTURE_WORKGROUP \
+			//$SMBTORTURE_REMOTE_HOST/$SMBTORTURE_REMOTE_SHARE_NAME \
+			$t || all_errs=`expr $all_errs + 1`
+		if [ $old_errs -lt $all_errs ]; then
+			# If test fails, load VM snapshot and skip cleanup.
+			restore_snapshot "\n$test_name failed."
 		else
-			echo -e "\n$test_name removal completed successfully."
+			echo -e "\n$test_name CLEANUP PHASE"
+			remove_share_test
+			if [ $err_rtn -ne 0 ]; then
+				# If cleanup fails, restore VM snapshot.
+				restore_snapshot "\n$test_name removal failed."
+			else
+				echo -e "\n$test_name removal completed successfully."
+			fi
 		fi
 	fi
-fi
+done
 
 rpc_tests="RPC-WINREG RPC-ASYNCBIND RPC-ATSVC RPC-DSSETUP RPC-EPMAPPER"
 rpc_tests="$rpc_tests RPC-INITSHUTDOWN RPC-LSA-GETUSER RPC-MULTIBIND RPC-ROT"