r19279: These setup and cleanup functions are general enough for any test which needs

a share to operate on, not just the qfileinfo test, so now they are named
more appropriately.
(This used to be commit eb16d5324d6e1f4e4b33993e23a6446c3289a85f)

diff --git a/source4/script/tests/test_win.sh b/source4/script/tests/test_win.sh
index 8861e2eccd16b00bc8b50566600dbda9fb97f4d5..b7cd3d2604c8928da3abf69eda9ffe20c772cea4 100755 (executable)
--- a/source4/script/tests/test_win.sh
+++ b/source4/script/tests/test_win.sh
@@ -18,7 +18,7 @@
 # I was finding that "cat common.exp wintest_setup.exp | expect -f -"
 # fails to run, but exits with 0 status something like 1% of the time.
 
 # I was finding that "cat common.exp wintest_setup.exp | expect -f -"
 # fails to run, but exits with 0 status something like 1% of the time.
 

-setup_qfileinfo_test()
+setup_share_test()

 {
        echo -e "\nSetting up windows environment."
        cat $WINTEST_DIR/common.exp > $TMPDIR/setup.exp
 {
        echo -e "\nSetting up windows environment."
        cat $WINTEST_DIR/common.exp > $TMPDIR/setup.exp


@@ -29,7 +29,7 @@ setup_qfileinfo_test()
 }
 
 # Clean up the windows environment after the test has run or failed.
 }
 
 # Clean up the windows environment after the test has run or failed.

-remove_qfileinfo_test()
+remove_share_test()

 {
        echo -e "\nCleaning up windows environment."
        cat $WINTEST_DIR/common.exp > $TMPDIR/remove.exp
 {
        echo -e "\nCleaning up windows environment."
        cat $WINTEST_DIR/common.exp > $TMPDIR/remove.exp


@@ -59,7 +59,7 @@ fi
 test_name="RAW-QFILEINFO / WINDOWS SERVER"
 echo -e "\n$test_name SETUP PHASE"
 
 test_name="RAW-QFILEINFO / WINDOWS SERVER"
 echo -e "\n$test_name SETUP PHASE"
 

-setup_qfileinfo_test
+setup_share_test

 
 if [ $err_rtn -ne 0 ]; then
        # If test setup fails, load VM snapshot and skip test.
 
 if [ $err_rtn -ne 0 ]; then
        # If test setup fails, load VM snapshot and skip test.