+2006-09-12 Boris Kirzner <borisk@mainsoft.com>
+ * run-tests.test.connected.bat, run-tests.test.disconnected.bat:
+ reworked logging options for TARGET_JVM tests.
+
2006-07-17 Senganal T <tsenganal@novell.com>
* System.Data.dll.sources:
+2006-09-12 Boris Kirzner <borisk@mainsoft.com>
+ * System.Data.OleDb.J2EE.config: changed test server name.
+
2006-03-16 Boris Kirzner <borisk@mainsfot.com>
* System.Data.SqlClient.jvm: added SqlClient tests for TARGET_JVM
* System.Data.OleDb.Tests.J2EE.vmwcsproj: added SqlClient tests for TARGET_JVM
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>\r
<configuration>\r
<appSettings>\r
- <add key="ConnectionString" value="Provider=SQLOLEDB.1;Data Source=xp050;Initial Catalog=GHTDB;User Id=sa;Password=" />\r
+ <add key="ConnectionString" value="Provider=SQLOLEDB.1;Data Source=powergh;Initial Catalog=GHTDB;User Id=sa;Password=sa" />\r
<!--\r
<add key="ConnectionString" value="Provider=SQLOLEDB.1;Data Source=xp050;Initial Catalog=GHTDB;User Id=sa;Password=" />\r
<add key="ConnectionString" value="Provider=MSDAORA.1;hostname=xp050;port=1521;User ID=ghtdb;Password=ghtdb;ServiceName=xp050;Data Source=xp050" />\r
<add key="ConnectionString" value="Provider=Mainsoft.JDBC.OLEDB.1;Persist Security Info=False;User ID=super;Data Source=PostgreSQL_XP050;Extended Properties="DSN=PostgreSQL_XP050;DATABASE=GHTDB;SERVER=xp050;PORT=5432;UID=super;ReadOnly=0;Protocol=6.4;FakeOidIndex=0;ShowOidColumn=0;RowVersioning=0;ShowSystemTables=0;ConnSettings=;Fetch=100;Socket=8192;UnknownSizes=0;MaxVarcharSize=254;MaxLongVarcharSize=8190;Debug=0;CommLog=0;Optimizer=1;Ksqo=1;UseDeclareFetch=0;TextAsLongVarchar=1;UnknownsAsLongVarchar=0;BoolsAsChar=0;Parse=0;CancelAsFreeStmt=0;ExtraSysTablePrefixes=dd_;;LFConversion=1;UpdatableCursors=0;DisallowPremature=0;TrueIsMinus1=0;BI=0;ByteaAsLongVarBinary=0;UseServerSidePrepare=0";Initial Catalog=GHTDB;JdbcDriverClassName=org.postgresql.Driver;JdbcURL=jdbc:postgresql://xp050/GHTDB;User=super;Password=super" />\r
-->\r
</appSettings>\r
-</configuration>
\ No newline at end of file
+</configuration>\r
\r
IF "%1"=="" GOTO USAGE\r
\r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
\r
-IF "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION\r
\r
\r
IF "%1"=="" (\r
REM ********************************************************\r
\r
set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=MonoTests.System.Data\r
+set OUTPUT_FILE_PREFIX=System.Data\r
set RUNNING_FIXTURE=MonoTests.System.Data\r
\r
set TEST_SOLUTION=Test\ProviderTests\System.Data.OleDb.Tests20.J2EE.sln\r
REM @echo Set environment\r
REM ********************************************************\r
\r
-set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JAVA_HOME=%VMW_HOME%\jre5\r
\r
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar\r
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\msbase.jar\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\mssqlserver.jar\r
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\msutil.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\msbase.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\mssqlserver.jar\r
+rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\msutil.jar\r
+\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\sqljdbc.jar\r
\r
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\postgresql-8.0.309.jdbc3.jar\r
\r
\r
set NUNIT_OPTIONS=/exclude=NotWorking\r
\r
-set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml\r
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml\r
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml\r
+set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt\r
+set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt\r
\r
set NUNIT_PATH=..\..\nunit20\\r
set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r
REM ********************************************************\r
\r
rem devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
-msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
\r
rem devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
\r
goto NUNITREADY\r
\r
\r
\r
REM @echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.%RUN_ID%.log.txt 2<&1\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
REM @echo off\r
\r
REM ********************************************************\r
REM ********************************************************\r
set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
rem devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.%RUN_ID%.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
@echo off\r
\r
:FINALLY\r
+\r
+copy %RUN_LOG% ..\\r
+copy %BUILD_LOG% ..\\r
+copy %GH_OUTPUT_XML% ..\\r
+\r
GOTO END\r
\r
:ENVIRONMENT_EXCEPTION\r
-@echo This test requires environment variables JAVA_HOME and GHROOT to be defined\r
+@echo This test requires environment variable VMW_HOME to be defined\r
GOTO END\r
\r
:BUILD_EXCEPTION\r
-@echo Error in building solutions. See %RUNNING_FIXTURE%_build.log.txt for details...\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
REM EXIT 1\r
GOTO END\r
\r
:RUN_EXCEPTION\r
-@echo Error in running fixture %RUNNING_FIXTURE%. See %RUNNING_FIXTURE%_run.%RUN_ID%.log.txt for details...\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...\r
REM EXIT 1\r
GOTO END\r
\r
\r
IF "%1"=="" GOTO USAGE\r
\r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
\r
-IF "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION\r
\r
\r
IF "%1"=="" (\r
REM ********************************************************\r
\r
set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=MonoTests.System.Data\r
+set OUTPUT_FILE_PREFIX=System.Data\r
set RUNNING_FIXTURE=MonoTests.System.Data\r
set TEST_SOLUTION=Test\System.Data.Test20.sln\r
set TEST_ASSEMBLY=System.Data.Test.jar\r
set PROJECT_CONFIGURATION=Debug_Java20\r
\r
+set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%\r
+set TIMEL=%time:~0,2%_%time:~3,2%\r
+set TIMESTAMP=%DATEL%_%TIMEL%\r
+\r
set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.disconnected\r
\r
REM ********************************************************\r
REM @echo Set environment\r
REM ********************************************************\r
\r
-set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JAVA_HOME=%VMW_HOME%\jre5\r
\r
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Data.jar;%JGAC_PATH%J2SE.Helpers.jar\r
set NUNIT_OPTIONS=/exclude=NotWorking\r
\r
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml\r
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml\r
+set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt\r
+set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt\r
\r
set NUNIT_PATH=..\..\nunit20\\r
set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar\r
REM ********************************************************\r
\r
rem devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
\r
REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
\r
goto NUNITREADY\r
\r
copy %BACK_TO_ROOT_DIR%Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
\r
REM @echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
REM @echo off\r
\r
REM ********************************************************\r
REM ********************************************************\r
set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
\r
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
\r
@echo off\r
\r
:FINALLY\r
+\r
+copy %RUN_LOG% ..\\r
+copy %BUILD_LOG% ..\\r
+copy %GH_OUTPUT_XML% ..\\r
+\r
GOTO END\r
\r
:ENVIRONMENT_EXCEPTION\r
-@echo This test requires environment variables JAVA_HOME and GHROOT to be defined\r
+@echo This test requires environment variable VMW_HOME to be defined\r
GOTO END\r
\r
:BUILD_EXCEPTION\r
-@echo Error in building solutions. See %RUNNING_FIXTURE%_build.log.txt for details...\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
REM EXIT 1\r
GOTO END\r
\r
:RUN_EXCEPTION\r
-@echo Error in running fixture %RUNNING_FIXTURE%. See %RUNNING_FIXTURE%_run.log.txt for details...\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...\r
REM EXIT 1\r
GOTO END\r
\r
projects / mono.git / commitdiff