summaryrefslogtreecommitdiff
path: root/test/windows
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-11-24 12:53:14 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-11-24 12:55:38 +0200
commitb6a2cf0054dd6639bfb72fd472a60cbf3ad53b7a (patch)
tree4f10069c5d6f5cead2a27040dc468aca00dee3d0 /test/windows
parentf7b2bea429417fe99ef46f815f82c1323c8f0e1e (diff)
Set NLSLANG environment variable for Windows tests
This environment variable is required by the call to OCIEnvNlsCreate.
Diffstat (limited to 'test/windows')
-rwxr-xr-xtest/windows/odb/setenv.bat3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat
index d23f85c..dd73cba 100755
--- a/test/windows/odb/setenv.bat
+++ b/test/windows/odb/setenv.bat
@@ -11,7 +11,8 @@ set ORACLE64=c:\projects\oracle64
set QTCORE=c:\projects\qtcore
set QTCORE64=c:\projects\qtcore64
set "ORACLE_OPTIONS=-L -S"
-set "DIFF=c:\cygwin\bin\diff.exe -ubB"
+set "NLSLANG=AMERICA_AMERICA.WE8MSWIN1252"
+if defined NLS_LANG SET NLSLANG=NLS_LANGset "DIFF=c:\cygwin\bin\diff.exe -ubB"
rem set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com"
set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-oracle\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%ORACLE%\bin;%QTCORE%\bin;%PATH%