summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-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%