for TARGET_J2EE only:

[mono.git] / mcs / class / System.Web / Test / mainsoft / run-test.bat

diff --git a/mcs/class/System.Web/Test/mainsoft/run-test.bat b/mcs/class/System.Web/Test/mainsoft/run-test.bat
index 27e104a84e2ba86d4665d04f75f054c489f7c14d..b575ccfd83bee39e0afc92ff7b8a10baabe62312 100755 (executable)
--- a/mcs/class/System.Web/Test/mainsoft/run-test.bat
+++ b/mcs/class/System.Web/Test/mainsoft/run-test.bat
@@ -3,7 +3,7 @@
 rem =================================================\r
 if "%GH_HOME%" == "" (set GH_HOME=c:\Program Files\Mainsoft\Visual MainWin for J2EE)\r
 if "%JAVA_HOME%" == "" (set JAVA_HOME=%GH_HOME%\jre5) \r
-set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\r
+set JGAC_PATH=%GH_HOME%\java_refs\framework\r
 \r
 rem =================================================\r
 echo Hiding svn...\r
@@ -16,12 +16,13 @@ RENAME "%%f" _svn
 rem =================================================\r
 if "%1"=="JBoss" (\r
 echo Building JBoss web project...\r
-"%VS71COMNTOOLS%..\IDE\devenv.com" MainsoftWebApp.JBoss.vmwcsproj /build Debug_Java\r
+"%VS71COMNTOOLS%..\IDE\devenv.com" MainsoftWebApp.JBoss.vmwcsproj /build Debug_Java  > nul\r
 ) else (\r
 echo Building Tomcat web project...\r
-"%VS71COMNTOOLS%..\IDE\devenv.com" MainsoftWebApp.Tomcat.vmwcsproj /build Debug_Java\r
+"%VS71COMNTOOLS%..\IDE\devenv.com" MainsoftWebApp.Tomcat.vmwcsproj /build Debug_Java  > nul\r
 )\r
 \r
+IF NOT ERRORLEVEL==0 (set BUILD_FAILED=TRUE)\r
 \r
 rem =================================================\r
 echo Restoring svn...\r
@@ -32,46 +33,56 @@ ATTRIB +h "%%~pf\.svn"
 popd\r
 \r
 rem =================================================\r
+IF "%BUILD_FAILED%"=="TRUE" GOTO FAILURE\r
+\r
+rem =================================================\r
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
 echo Build NUnit...\r
 pushd ..\..\..\..\nunit20\\r
-"%VS71COMNTOOLS%..\IDE\devenv.com" nunit.java.sln /build Debug_Java\r
+"%VS71COMNTOOLS%..\IDE\devenv.com" nunit.java.sln /build Debug_Java > nul\r
 popd\r
 \r
+goto NUNITREADY\r
+:NUNITSKIP\r
+echo Skipping NUnit Build...\r
+:NUNITREADY\r
+set NUNIT_BUILD=DONE\r
+\r
 rem =================================================\r
 echo Build System.Web test client side...\r
 pushd MainsoftWebTest\r
-"%VS71COMNTOOLS%..\IDE\devenv.com" SystemWebTest.vmwcsproj /build Debug_Java_NUnit\r
+"%VS71COMNTOOLS%..\IDE\devenv.com" SystemWebTest.vmwcsproj /build Debug_Java_NUnit > nul\r
 popd\r
 \r
 rem =================================================\r
+if "%TEST_17%" == "TRUE" goto SKIPMONO3\r
 echo Build System.Web mono tests...\r
 pushd ..\r
-dos2unix System.Web.UI.HtmlControls\HtmlSelectTest.cs\r
-dos2unix System.Web.UI.WebControls\CheckBoxListTest.cs\r
-dos2unix System.Web.UI.WebControls\RepeatInfoTest.auto.cs\r
-"%VS71COMNTOOLS%..\IDE\devenv.com" TestMonoWeb_jvm.vmwcsproj /build Debug_Java\r
+dos2unix System.Web.UI.HtmlControls\HtmlSelectTest.cs  > nul\r
+dos2unix System.Web.UI.WebControls\CheckBoxListTest.cs  > nul\r
+dos2unix System.Web.UI.WebControls\RepeatInfoTest.auto.cs  > nul\r
+"%VS71COMNTOOLS%..\IDE\devenv.com" TestMonoWeb_jvm.vmwcsproj /build Debug_Java  > nul\r
 popd\r
+:SKIPMONO3\r
 \r
 rem =================================================\r
-copy MainsoftWebTest\almost_config.xml MainsoftWebTest\bin\almost_config.xml /Y\r
-copy MainsoftWebTest\test_catalog.xml MainsoftWebTest\bin\test_catalog.xml /Y\r
-copy MainsoftWebTest\App.gh.config MainsoftWebTest\bin\nunit-console.exe.config /Y\r
-copy ..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.jar MainsoftWebTest\bin\nunit.core.jar /Y\r
-copy ..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.jar MainsoftWebTest\bin\nunit.framework.jar /Y\r
-copy ..\..\..\..\nunit20\util\bin\Debug_Java\nunit.util.jar MainsoftWebTest\bin\nunit.util.jar /Y\r
-copy ..\..\..\..\nunit20\nunit-console\bin\Debug_Java\nunit-console.jar MainsoftWebTest\bin\nunit-console.jar /Y\r
+copy MainsoftWebTest\almost_config.xml MainsoftWebTest\bin\almost_config.xml /Y  > nul\r
+copy MainsoftWebTest\test_catalog.xml MainsoftWebTest\bin\test_catalog.xml /Y  > nul\r
+copy MainsoftWebTest\App.gh.config MainsoftWebTest\bin\nunit-console.exe.config /Y  > nul\r
+copy ..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.jar MainsoftWebTest\bin\nunit.core.jar /Y  > nul\r
+copy ..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.jar MainsoftWebTest\bin\nunit.framework.jar /Y  > nul\r
+copy ..\..\..\..\nunit20\util\bin\Debug_Java\nunit.util.jar MainsoftWebTest\bin\nunit.util.jar /Y  > nul\r
+copy ..\..\..\..\nunit20\nunit-console\bin\Debug_Java\nunit-console.jar MainsoftWebTest\bin\nunit-console.jar /Y  > nul\r
 \r
 rem =================================================\r
 echo Buildinig xmltool...\r
 pushd ..\..\..\..\tools\mono-xmltool\r
-"%VS71COMNTOOLS%..\IDE\devenv.com" XmlTool.sln /build Debug_Java\r
+"%VS71COMNTOOLS%..\IDE\devenv.com" XmlTool.sln /build Debug_Java  > nul\r
 popd\r
-copy ..\..\..\..\tools\mono-xmltool\bin\Debug_Java\xmltool.exe MainsoftWebTest\bin\xmltool.exe\r
-copy ..\..\..\..\tools\mono-xmltool\nunit_transform.xslt MainsoftWebTest\bin\nunit_transform.xslt\r
+copy ..\..\..\..\tools\mono-xmltool\bin\Debug_Java\xmltool.exe MainsoftWebTest\bin\xmltool.exe  > nul\r
+copy ..\..\..\..\tools\mono-xmltool\nunit_transform.xslt MainsoftWebTest\bin\nunit_transform.xslt  > nul\r
 \r
 rem =================================================\r
-echo Running...\r
-\r
 set GH_CP=%JGAC_PATH%\mscorlib.jar\r
 set GH_CP=%GH_CP%;%JGAC_PATH%\System.jar\r
 set GH_CP=%GH_CP%;%JGAC_PATH%\System.Xml.jar\r
@@ -92,12 +103,28 @@ set monologfile=mono.xml
 \r
 pushd MainsoftWebTest\bin\r
 \r
-"%JAVA_HOME%\bin\java.exe" -cp .;"%GH_CP%" NUnit.Console.ConsoleUi SystemWebTest.jar /xml=%ghlogfile% /fixture:MonoTests.stand_alone.WebHarness.Harness\r
-"%JAVA_HOME%\bin\java.exe" -cp .;"%GH_CP%" NUnit.Console.ConsoleUi TestMonoWeb_jvm.jar /xml=%monologfile% /exclude:NotWorking,ValueAdd,InetAccess /fixture:MonoTests.System.Web\r
+echo Running Mainsoft tests...\r
+"%JAVA_HOME%\bin\java.exe" -cp .;"%GH_CP%" NUnit.Console.ConsoleUi SystemWebTest.jar /xml=%ghlogfile% /fixture:MonoTests.stand_alone.WebHarness.Harness  > nul\r
+\r
+if "%TEST_17%" == "TRUE" goto SKIPMONO\r
+echo Running Mono tests...\r
+"%JAVA_HOME%\bin\java.exe" -cp .;"%GH_CP%" NUnit.Console.ConsoleUi TestMonoWeb_jvm.jar /xml=%monologfile% /exclude:NotWorking,ValueAdd,InetAccess /fixture:MonoTests.System.Web  > nul\r
+:SKIPMONO\r
 \r
 echo Finished...\r
 xmltool.exe --transform nunit_transform.xslt %ghlogfile%\r
+\r
+if "%TEST_17%" == "TRUE" goto SKIPMONO2\r
 xmltool.exe --transform nunit_transform.xslt %monologfile%\r
+:SKIPMONO2\r
+\r
+popd\r
 \r
+goto :END\r
+:FAILURE\r
 popd\r
+echo Failed during build...\r
+set BUILD_FAILED=\r
+:END\r
+\r
 \r