Author: borisk
Date: 2006-09-12 07:07:39 -0400 (Tue, 12 Sep 2006)
New Revision: 65294
Modified:
trunk/mcs/class/System.Data.OracleClient/ChangeLog
trunk/mcs/class/System.Data.OracleClient/Test/ChangeLog
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.J2EE.config
trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat
Log:
Fixes for TARGET_JVM tests.
Modified: trunk/mcs/class/System.Data.OracleClient/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/ChangeLog 2006-09-12 11:02:14 UTC
(rev 65293)
+++ trunk/mcs/class/System.Data.OracleClient/ChangeLog 2006-09-12 11:07:39 UTC
(rev 65294)
@@ -1,3 +1,7 @@
+2006-09-12 Boris Kirzner <[EMAIL PROTECTED]>
+
+ * run-tests.test.bat: rework logging for TARGET_JVM tests.
+
2006-09-12 Leszek Ciesielski <[EMAIL PROTECTED]>
* OracleLob.cs : fix for bug 78898
Modified: trunk/mcs/class/System.Data.OracleClient/Test/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/Test/ChangeLog 2006-09-12
11:02:14 UTC (rev 65293)
+++ trunk/mcs/class/System.Data.OracleClient/Test/ChangeLog 2006-09-12
11:07:39 UTC (rev 65294)
@@ -1,3 +1,7 @@
+2006-19-12 Boris Kizner <[EMAIL PROTECTED]>
+
+ * System.Data.OracleClient.J2EE.config: change tests server.
+
2006-08-21 Boris Kirzner <[EMAIL PROTECTED]>
* System.Data.OracleClient.Tests20.J2EE.sln,
Modified:
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.J2EE.config
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.J2EE.config
2006-09-12 11:02:14 UTC (rev 65293)
+++
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.J2EE.config
2006-09-12 11:07:39 UTC (rev 65294)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
- <add key="ConnectionString"
value="hostname=xp050;port=1521;User
ID=ghtdb;Password=ghtdb;ServiceName=xp050;Data Source=xp050" />
+ <add key="ConnectionString"
value="hostname=powergh;port=1521;User
ID=ghtdb;Password=ghtdb;ServiceName=powergh;Data Source=powergh" />
<!--
<add key="ConnectionString" value="Provider=SQLOLEDB.1;Data
Source=xp050;Initial Catalog=GHTDB;User Id=sa;Password=" />
<add key="ConnectionString"
value="Provider=MSDAORA.1;hostname=xp050;port=1521;User
ID=ghtdb;Password=ghtdb;ServiceName=xp050;Data Source=xp050" />
Modified: trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat 2006-09-12
11:02:14 UTC (rev 65293)
+++ trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat 2006-09-12
11:07:39 UTC (rev 65294)
@@ -15,9 +15,8 @@
IF "%1"=="" GOTO USAGE
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-IF "%GHROOT%"=="" GOTO ENVIRONMENT_EXCEPTION
IF "%1"=="" (
@@ -31,7 +30,7 @@
REM ********************************************************
set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=MonoTests.System.Data.OracleClient
+set OUTPUT_FILE_PREFIX=System.Data.OracleClient
set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient
set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln
@@ -45,7 +44,8 @@
REM @echo Set environment
REM ********************************************************
-set JGAC_PATH=%GHROOT%\jgac\vmw4j2ee_110\
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JAVA_HOME=%VMW_HOME%\jre5
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
@@ -58,8 +58,9 @@
set NUNIT_OPTIONS=/exclude=NotWorking
-set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.%TIMESTAMP%.xml
+set BUILD_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt
+set RUN_LOG=%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt
set NUNIT_PATH=..\..\nunit20\
set
NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar
@@ -76,7 +77,7 @@
REM ********************************************************
REM devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION%
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %TEST_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -85,7 +86,7 @@
REM ********************************************************
REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION%
%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -102,7 +103,7 @@
REM @echo on
-"%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
+"%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
REM @echo off
REM ********************************************************
@@ -110,7 +111,7 @@
REM ********************************************************
set XML_TOOL_PATH=..\..\tools\mono-xmltool
REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -125,19 +126,24 @@
@echo off
:FINALLY
+
+copy %RUN_LOG% ..\
+copy %BUILD_LOG% ..\
+copy %GH_OUTPUT_XML% ..\
+
GOTO END
:ENVIRONMENT_EXCEPTION
[EMAIL PROTECTED] This test requires environment variables JAVA_HOME and GHROOT
to be defined
[EMAIL PROTECTED] This test requires environment variable VMW_HOME to be defined
GOTO END
:BUILD_EXCEPTION
[EMAIL PROTECTED] Error in building solutions. See
%RUNNING_FIXTURE%_build.log.txt for details...
[EMAIL PROTECTED] Error in building solutions. See %BUILD_LOG% for details...
REM EXIT 1
GOTO END
:RUN_EXCEPTION
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See
%RUNNING_FIXTURE%_run.log.txt for details...
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for
details...
REM EXIT 1
GOTO END
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches