diff options
| author | Boris Kirzner <borisk@mono-cvs.ximian.com> | 2006-03-16 16:01:06 +0300 |
|---|---|---|
| committer | Boris Kirzner <borisk@mono-cvs.ximian.com> | 2006-03-16 16:01:06 +0300 |
| commit | a78f813908e6e53e721fa97222e3298e43f58fbf (patch) | |
| tree | add09fc82bdfba6fcc80bb484f5b46e352a7d293 /mcs/class | |
| parent | 123c8cebc666fb8e0945b1e5f9761dd261d61a74 (diff) | |
Fix testing scripts for TARGET_JVM
svn path=/trunk/mcs/; revision=58059
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/System.Data/ChangeLog | 3 | ||||
| -rwxr-xr-x | mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt | 2 | ||||
| -rw-r--r-- | mcs/class/System.Data/run-tests.test.connected.bat | 11 |
3 files changed, 13 insertions, 3 deletions
diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog index a7c6de91855..6800b0ed8e2 100644 --- a/mcs/class/System.Data/ChangeLog +++ b/mcs/class/System.Data/ChangeLog @@ -1,3 +1,6 @@ +2006-03-16 Boris Kirzner <borisk@mainsfot.com> + * run-tests.test.connected.bat - fix classpath in TARGET_JVM test script. + 2006-03-12 Boris Kirzner <borisk@mainsfot.com> * run-tests.bat, run-tests.test.connected.bat, run-tests.test.disconnected.bat added batch files for automated testing for TARGET_JVM. diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt index f5144507180..9957b9785bf 100755 --- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/readme.txt @@ -1,6 +1,6 @@ To run unit test the following should be prepared: -1. nunit-console.exe.config should contain an ConnectionString setting, i.e.: +1. System.Data\Test\ProviderTests\System.Data.OleDb.J2EE.config should contain an ConnectionString setting, i.e.: <?xml version="1.0" encoding="utf-8" ?> <configuration> diff --git a/mcs/class/System.Data/run-tests.test.connected.bat b/mcs/class/System.Data/run-tests.test.connected.bat index 78449c22aee..644a2d4ef91 100644 --- a/mcs/class/System.Data/run-tests.test.connected.bat +++ b/mcs/class/System.Data/run-tests.test.connected.bat @@ -58,6 +58,13 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\msbase.jar set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\mssqlserver.jar
set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\msutil.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\postgresql-8.0.309.jdbc3.jar
+
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\ojdbc14.jar
+
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\db2jcc.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GH_HOME%\jgac\jdbc\db2jcc_license_cu.jar
+
set NUNIT_OPTIONS=/exclude=NotWorking
set NET_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.Net.xml
@@ -69,7 +76,7 @@ set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\Debug_Java\n set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar
set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar
set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;C:\cygwin\monobuild\mcs\class\System.Data\System.Data.OleDb.Tests.jar
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;System.Data.OleDb.Tests.jar
set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
@@ -102,7 +109,7 @@ copy %APP_CONFIG_FILE% nunit-console.exe.config REM @echo on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi C:\cygwin\monobuild\mcs\class\System.Data\%TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.%RUN_ID%.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% >>%RUNNING_FIXTURE%_run.%RUN_ID%.log.txt 2<&1
REM @echo off
REM ********************************************************
|