diff options
| author | Vladimir Krasnov <krasnov@mono-cvs.ximian.com> | 2006-03-07 13:04:35 +0300 |
|---|---|---|
| committer | Vladimir Krasnov <krasnov@mono-cvs.ximian.com> | 2006-03-07 13:04:35 +0300 |
| commit | 0c4a5bf0c85ae912e50763cb1d961679f445ce5c (patch) | |
| tree | bf8795e44a6709cc6820fc5e0f6b182f6a2dba76 /mcs | |
| parent | 7b06096070f85d3733e7c037c713c2fd64004ee1 (diff) | |
* run-test.bat: fixed enviroment variables
svn path=/trunk/mcs/; revision=57652
Diffstat (limited to 'mcs')
| -rwxr-xr-x | mcs/class/System.Web/Test/mainsoft/ChangeLog | 4 | ||||
| -rwxr-xr-x | mcs/class/System.Web/Test/mainsoft/run-test.bat | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/mcs/class/System.Web/Test/mainsoft/ChangeLog b/mcs/class/System.Web/Test/mainsoft/ChangeLog index e2ceda54a9d..852ab12e2e6 100755 --- a/mcs/class/System.Web/Test/mainsoft/ChangeLog +++ b/mcs/class/System.Web/Test/mainsoft/ChangeLog @@ -1,3 +1,7 @@ +2006-03-07 Vladimir Krasnov <vladimirk@mainsoft.com> + + * run-test.bat: fixed enviroment variables + 2006-03-05 Vladimir Krasnov <vladimirk@mainsoft.com> * run-test.bat: added running of mono test suite diff --git a/mcs/class/System.Web/Test/mainsoft/run-test.bat b/mcs/class/System.Web/Test/mainsoft/run-test.bat index c1f9c4f2c2d..27e104a84e2 100755 --- a/mcs/class/System.Web/Test/mainsoft/run-test.bat +++ b/mcs/class/System.Web/Test/mainsoft/run-test.bat @@ -1,8 +1,9 @@ @ECHO OFF
rem =================================================
-set JAVA_HOME=c:\j2sdk1.4.2_09
-set JGAC_PATH=c:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110
+if "%GH_HOME%" == "" (set GH_HOME=c:\Program Files\Mainsoft\Visual MainWin for J2EE)
+if "%JAVA_HOME%" == "" (set JAVA_HOME=%GH_HOME%\jre5)
+set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110
rem =================================================
echo Hiding svn...
@@ -45,6 +46,9 @@ popd rem =================================================
echo Build System.Web mono tests...
pushd ..
+dos2unix System.Web.UI.HtmlControls\HtmlSelectTest.cs
+dos2unix System.Web.UI.WebControls\CheckBoxListTest.cs
+dos2unix System.Web.UI.WebControls\RepeatInfoTest.auto.cs
"%VS71COMNTOOLS%..\IDE\devenv.com" TestMonoWeb_jvm.vmwcsproj /build Debug_Java
popd
@@ -88,8 +92,8 @@ set monologfile=mono.xml pushd MainsoftWebTest\bin
-%JAVA_HOME%\bin\java.exe -cp .;"%GH_CP%" NUnit.Console.ConsoleUi SystemWebTest.jar /xml=%ghlogfile% /fixture:MonoTests.stand_alone.WebHarness.Harness
-%JAVA_HOME%\bin\java.exe -cp .;"%GH_CP%" NUnit.Console.ConsoleUi TestMonoWeb_jvm.jar /xml=%monologfile% /exclude:NotWorking,ValueAdd,InetAccess /fixture:MonoTests.System.Web
+"%JAVA_HOME%\bin\java.exe" -cp .;"%GH_CP%" NUnit.Console.ConsoleUi SystemWebTest.jar /xml=%ghlogfile% /fixture:MonoTests.stand_alone.WebHarness.Harness
+"%JAVA_HOME%\bin\java.exe" -cp .;"%GH_CP%" NUnit.Console.ConsoleUi TestMonoWeb_jvm.jar /xml=%monologfile% /exclude:NotWorking,ValueAdd,InetAccess /fixture:MonoTests.System.Web
echo Finished...
xmltool.exe --transform nunit_transform.xslt %ghlogfile%
|