r18026: patch from Brad allowing the windows testing to be configured

externally in the build farm
(This used to be commit a85646cba5ae5f96d99bd79d491e4151ffe6e78e)

diff --git a/source4/script/tests/test_win.sh b/source4/script/tests/test_win.sh
index c4d11d5bd7e4c58e06ac6bfad25d99949791c38f..44828541256e27459037520f0c6f261287fa20ae 100644 (file)
--- a/source4/script/tests/test_win.sh
+++ b/source4/script/tests/test_win.sh
@@ -7,7 +7,9 @@
 # Copyright Brad Henry <brad@samba.org> 2006
 # Released under the GNU GPL v2 or later.
 
 # Copyright Brad Henry <brad@samba.org> 2006
 # Released under the GNU GPL v2 or later.
 

-. $WINTEST_DIR/test_win.conf
+
+# This variable is defined in the per-hosts .fns file.
+. $WINTESTCONF

 
 # Setup the windows environment.
 # This was the best way I could figure out including library files
 
 # Setup the windows environment.
 # This was the best way I could figure out including library files

diff --git a/source4/script/tests/tests_win.sh b/source4/script/tests/tests_win.sh
index 6bb5fb90b7e7fb2cb58f0b59115ee7f8d5b21197..5c3c81b1eb6332e9fdc5fb9ca43be0a27f5f744c 100644 (file)
--- a/source4/script/tests/tests_win.sh
+++ b/source4/script/tests/tests_win.sh
@@ -10,9 +10,14 @@
        exit 1
  fi
 
        exit 1
  fi
 

- WINTEST_CONFFILE="$SRCDIR/script/tests/win/test_win.conf"
- if [ ! -r $WINTEST_CONFFILE ]; then
-       echo "$WINTEST_CONFFILE could not be read."
+ if [ ! $WINTESTCONF ]; then
+       echo "Environment variable WINTESTCONF has not been defined."
+       echo "Windows tests will not run unconfigured."
+       exit 1
+ fi
+
+ if [ ! -r $WINTESTCONF ]; then
+       echo "$WINTESTCONF could not be read."

        exit 1
  fi
 
        exit 1
  fi
 


@@ -20,7 +25,7 @@
  export TMPDIR=$TMPDIR
  export NETBIOSNAME=$NETBIOSNAME
 
  export TMPDIR=$TMPDIR
  export NETBIOSNAME=$NETBIOSNAME
 

- . $WINTEST_CONFFILE
+ . $WINTESTCONF

 
  $SRCDIR/script/tests/test_win.sh
  status=$?
 
  $SRCDIR/script/tests/test_win.sh
  status=$?