svn path=/trunk/mcs/; revision=104772
authorNoam Lampert <noaml@mono-cvs.ximian.com>
Tue, 3 Jun 2008 17:19:54 +0000 (17:19 -0000)
committerNoam Lampert <noaml@mono-cvs.ximian.com>
Tue, 3 Jun 2008 17:19:54 +0000 (17:19 -0000)
mcs/class/System.Web.Extensions/run-tests-nunit.bat
mcs/class/System.Web.Extensions/run-tests.cmd [changed mode: 0644->0755]
mcs/class/System.Web.Extensions/run-tests.selenium.cmd [new file with mode: 0644]

index 5bc65ec2595cddb221f13e5c5e3ef5d35c2bb564..143f83a558d469a30051a9203e44e1babd98f184 100644 (file)
@@ -1,4 +1,5 @@
 @echo off\r
+setlocal\r
 @REM ********************************************************\r
 @REM This batch file receives the follwing parameters:\r
 @REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -53,7 +54,8 @@ set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%
 @REM ********************************************************\r
 \r
 set JGAC_PATH=%VMW_HOME%\java_refs\framework\\r
-set JAVA_HOME=%VMW_HOME%\jre\r
+if not defined JAVA_HOME set JAVA_HOME=%VMW_HOME%\jre\r
+echo using JAVA_HOME=%JAVA_HOME%\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
@@ -193,3 +195,4 @@ copy %BUILD_LOG% ..\
 copy %GH_OUTPUT_XML% ..\\r
 \r
 @REM EXIT 0\r
+endlocal
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 3205c5e..5a0ba98
@@ -1,120 +1,6 @@
-@echo off\r
-setlocal\r
 \r
-:loop\r
-if "%1" == "" goto break\r
-if "%1" == "skip_selenium" (\r
-       set SKIP_SELENIUM="True"\r
-)\r
-if "%1" == "skip_app" (\r
-       set SKIP_APP="True"\r
-)\r
-if "%1" == "skip_tests" (\r
-       set SKIP_TESTS="True"\r
-)\r
-shift /1\r
-goto loop\r
-:break\r
+call run-tests-nunit.bat\r
 \r
-rem SETUP ENVIRONMENT FOR RUNNING SELENIUM TESTS\r
-rem ============================================\r
-if "%VMW_HOME%" == "" set VMW_HOME=C:\Program Files\Mainsoft for Java EE\r
-\r
-if NOT "%SELENIUM_HOME%" == "" goto after_set_SELENIUM_HOME\r
-set SELENIUM_HOME=%~dp0\r
-set SELENIUM_HOME=%SELENIUM_HOME:class\System.Web.Extensions=selenium%\r
-:after_set_SELENIUM_HOME\r
-\r
-set Browser=C:\Program Files\Internet Explorer\iexplore.exe\r
-set HTTPServer=http://localhost:8090\r
-set SeleniumURL=%HTTPServer%/Selenium\r
-\r
-rem =================================================\r
-set startDate=%date%\r
-set startTime=%time%\r
-set sdy=%startDate:~10%\r
-set /a sdm=1%startDate:~4,2% - 100\r
-set /a sdd=1%startDate:~7,2% - 100\r
-set /a sth=%startTime:~0,2%\r
-set /a stm=1%startTime:~3,2% - 100\r
-set /a sts=1%startTime:~6,2% - 100\r
-set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%\r
-\r
-set ResultsURL=/PostResults\r
-set ResultsDir=FuncTests%TIMESTAMP%\r
-set OUTPUT_FILE_PREFIX=System_Web_Extensions\r
-\r
-set COMMON_PREFIX=%cd%\%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
-set SELENIUM_OUTPUT_XML=%COMMON_PREFIX%.xml\r
-set BUILD_LOG=%COMMON_PREFIX%.build.log\r
-set RUN_LOG=%COMMON_PREFIX%.run.log\r
-\r
-rem DEPLOY SELENIUM WITH TESTS TO SERVER\r
-rem ====================================\r
-if DEFINED SKIP_SELENIUM goto after_selenium\r
-echo Deploying Selenium\r
-call %SELENIUM_HOME%\DeploySelenium.cmd "Tomcat" "%SELENIUM_HOME%\TomcatDeploy.cmd" "http://admin:admin@localhost:8090" >>%BUILD_LOG% 2<&1\r
-:after_selenium\r
-\r
-rem BUILD APPLICATION UNDER TEST\r
-rem ============================================\r
-if DEFINED SKIP_APP goto after_app\r
-pushd Test\AUT\r
-echo Building %cd%\SystemWebExtensionsAUT.JavaEE.csproj\r
-del /F /Q bin_Java\deployedFiles bin_Java\outputFiles.list\r
-msbuild SystemWebExtensionsAUT.JavaEE.csproj /t:Deploy /p:Configuration=Debug_Java >>%BUILD_LOG% 2<&1\r
-popd\r
-:after_app\r
-\r
-if DEFINED SKIP_TESTS goto after_tests\r
-\r
-echo Running Functional Test Suites\r
-\r
-mkdir %ResultsDir%\r
-type %SELENIUM_HOME%\SeleniumTestResultsHead.txt >%SELENIUM_OUTPUT_XML%\r
-\r
-wget -O .\nul "%HTTPServer%%ResultsURL%/Default.ashx" >>%RUN_LOG% 2<&1\r
-wget -O "%ResultsDir%\selenium-test.css" "%HTTPServer%%ResultsURL%/selenium-test.css" >>%RUN_LOG% 2<&1\r
-\r
-rem RUN THE TEST SUITES ONE AFTER THE OTHER\r
-rem ============================================\r
-\r
-call :executeTestSuite /SystemWebExtensionsAUT/Selenium/System.Web.UI/UpdatePanel/UpdatePanelTestSuite.html\r
-call :executeTestSuite /SystemWebExtensionsAUT/Selenium/Sys.WebForms/PageRequestManager/PageRequestManagerTestSuite.html\r
-call :executeTestSuite /SystemWebExtensionsAUT/Selenium/QuickStarts/QuickStartTestSuite.html\r
-\r
-\r
-rem ADD MORE TEST SUITES ABOVE THIS LINE\r
-rem ====================================\r
-\r
-type %SELENIUM_HOME%\SeleniumTestResultsTail.txt >>%SELENIUM_OUTPUT_XML%\r
-\r
-:after_tests\r
-goto afterExecuteTestSuite\r
-\r
-rem INTERNAL SCRIPT FUNCTION TO RUN SPECIFIC TEST SUITE\r
-rem ===================================================\r
-:executeTestSuite\r
-\r
-set TestSuiteRelativePath=%1\r
-set SuiteName=%~n1\r
-set ResultsAsXML=%ResultsDir%\%SuiteName%Results.xml\r
-set ResultsAsHtml=%ResultsDir%\%SuiteName%Results.html\r
-\r
-echo Test suite: %SuiteName%\r
-echo Test suite: %SuiteName% >>%RUN_LOG% 2<&1\r
-"%Browser%" "%SeleniumURL%/core/TestRunner.html?test=%TestSuiteRelativePath%&auto=true&close=on&multiWindow=off&resultsUrl=%ResultsURL%/Default.ashx"\r
-\r
-if NOT %ResultsAsXML%=="" (\r
-       wget -O "%ResultsAsXML%" "%HTTPServer%%ResultsURL%/GetLastResults.ashx" >>%RUN_LOG% 2<&1\r
-       type "%ResultsAsXML%" >>%SELENIUM_OUTPUT_XML%\r
-)\r
-\r
-if NOT %ResultsAsHtml%=="" (\r
-       wget -O "%ResultsAsHtml%" "%HTTPServer%%ResultsURL%/GetLastResults.ashx?Html" >>%RUN_LOG% 2<&1\r
-)\r
-\r
-exit /B\r
-:afterExecuteTestSuite\r
-\r
-endlocal
\ No newline at end of file
+call run-tests.selenium.cmd\r
\r
\ No newline at end of file
diff --git a/mcs/class/System.Web.Extensions/run-tests.selenium.cmd b/mcs/class/System.Web.Extensions/run-tests.selenium.cmd
new file mode 100644 (file)
index 0000000..a52a165
--- /dev/null
@@ -0,0 +1,130 @@
+@echo off\r
+setlocal\r
+\r
+:loop\r
+if "%1" == "" goto break\r
+if "%1" == "skip_selenium" (\r
+       set SKIP_SELENIUM="True"\r
+)\r
+if "%1" == "skip_app" (\r
+       set SKIP_APP="True"\r
+)\r
+if "%1" == "skip_tests" (\r
+       set SKIP_TESTS="True"\r
+)\r
+shift /1\r
+goto loop\r
+:break\r
+\r
+rem SETUP ENVIRONMENT FOR RUNNING SELENIUM TESTS\r
+rem ============================================\r
+if "%VMW_HOME%" == "" set VMW_HOME=C:\Program Files\Mainsoft for Java EE\r
+\r
+if NOT "%SELENIUM_HOME%" == "" goto after_set_SELENIUM_HOME\r
+set SELENIUM_HOME=%~dp0\r
+set SELENIUM_HOME=%SELENIUM_HOME:class\System.Web.Extensions=selenium%\r
+:after_set_SELENIUM_HOME\r
+echo SELENIUM_HOME=%SELENIUM_HOME%\r
+\r
+set Browser=C:\Program Files\Internet Explorer\iexplore.exe\r
+set HTTPServer=http://localhost:8080\r
+set SeleniumURL=%HTTPServer%/Selenium\r
+\r
+rem =================================================\r
+set startDate=%date%\r
+set startTime=%time%\r
+set sdy=%startDate:~10%\r
+set /a sdm=1%startDate:~4,2% - 100\r
+set /a sdd=1%startDate:~7,2% - 100\r
+set /a sth=%startTime:~0,2%\r
+set /a stm=1%startTime:~3,2% - 100\r
+set /a sts=1%startTime:~6,2% - 100\r
+set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%\r
+\r
+set ResultsURL=/PostResults\r
+set ResultsDir=FuncTests%TIMESTAMP%\r
+set OUTPUT_FILE_PREFIX=System_Web_Extensions\r
+\r
+set COMMON_PREFIX=%cd%\%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set SELENIUM_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
+\r
+rem DEPLOY SELENIUM WITH TESTS TO SERVER\r
+rem ====================================\r
+if DEFINED SKIP_SELENIUM goto after_selenium\r
+echo Deploying Selenium\r
+call %SELENIUM_HOME%\DeploySelenium.cmd "Tomcat" "%SELENIUM_HOME%\TomcatDeploy.cmd" "http://admin:admin@localhost:8080" >>%BUILD_LOG% 2<&1\r
+:after_selenium\r
+\r
+rem BUILD APPLICATION UNDER TEST\r
+rem ============================================\r
+if DEFINED SKIP_APP goto after_app\r
+pushd Test\AUT\r
+echo Building %cd%\SystemWebExtensionsAUT.JavaEE.csproj\r
+del /F /Q bin_Java\deployedFiles bin_Java\outputFiles.list\r
+msbuild SystemWebExtensionsAUT.JavaEE.csproj /t:Rebuild /t:Deploy /p:Configuration=Debug_Java >>%BUILD_LOG% 2<&1\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+popd\r
+:after_app\r
+\r
+if DEFINED SKIP_TESTS goto after_tests\r
+\r
+echo Running Functional Test Suites\r
+\r
+mkdir %ResultsDir%\r
+type %SELENIUM_HOME%\SeleniumTestResultsHead.txt >%SELENIUM_OUTPUT_XML%\r
+\r
+wget -O .\nul "%HTTPServer%%ResultsURL%/Default.ashx" >>%RUN_LOG% 2<&1\r
+wget -O "%ResultsDir%\selenium-test.css" "%HTTPServer%%ResultsURL%/selenium-test.css" >>%RUN_LOG% 2<&1\r
+\r
+rem RUN THE TEST SUITES ONE AFTER THE OTHER\r
+rem ============================================\r
+\r
+call :executeTestSuite /SystemWebExtensionsAUT/Selenium/System.Web.UI/UpdatePanel/UpdatePanelTestSuite.html\r
+call :executeTestSuite /SystemWebExtensionsAUT/Selenium/Sys.WebForms/PageRequestManager/PageRequestManagerTestSuite.html\r
+call :executeTestSuite /SystemWebExtensionsAUT/Selenium/QuickStarts/QuickStartTestSuite.html\r
+\r
+\r
+rem ADD MORE TEST SUITES ABOVE THIS LINE\r
+rem ====================================\r
+\r
+type %SELENIUM_HOME%\SeleniumTestResultsTail.txt >>%SELENIUM_OUTPUT_XML%\r
+\r
+:after_tests\r
+goto afterExecuteTestSuite\r
+\r
+rem INTERNAL SCRIPT FUNCTION TO RUN SPECIFIC TEST SUITE\r
+rem ===================================================\r
+:executeTestSuite\r
+\r
+set TestSuiteRelativePath=%1\r
+set SuiteName=%~n1\r
+set ResultsAsXML=%ResultsDir%\%SuiteName%Results.xml\r
+set ResultsAsHtml=%ResultsDir%\%SuiteName%Results.html\r
+\r
+echo Test suite: %SuiteName%\r
+echo Test suite: %SuiteName% >>%RUN_LOG% 2<&1\r
+"%Browser%" "%SeleniumURL%/core/TestRunner.html?test=%TestSuiteRelativePath%&auto=true&close=on&multiWindow=off&resultsUrl=%ResultsURL%/Default.ashx"\r
+\r
+if NOT %ResultsAsXML%=="" (\r
+       wget -O "%ResultsAsXML%" "%HTTPServer%%ResultsURL%/GetLastResults.ashx" >>%RUN_LOG% 2<&1\r
+       type "%ResultsAsXML%" >>%SELENIUM_OUTPUT_XML%\r
+)\r
+\r
+if NOT %ResultsAsHtml%=="" (\r
+       wget -O "%ResultsAsHtml%" "%HTTPServer%%ResultsURL%/GetLastResults.ashx?Html" >>%RUN_LOG% 2<&1\r
+)\r
+\r
+exit /B\r
+\r
+goto END\r
+:BUILD_EXCEPTION\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
+REM EXIT 1\r
+GOTO END\r
+\r
+:afterExecuteTestSuite\r
+:END\r
+endlocal\r
+\r