SqlClient mono friendly bits

[mono.git] / mcs / class / System.Web.Extensions / run-tests.cmd

diff --git a/mcs/class/System.Web.Extensions/run-tests.cmd b/mcs/class/System.Web.Extensions/run-tests.cmd
old mode 100644 (file)
new mode 100755 (executable)
index 62342d7..5a0ba98
--- a/mcs/class/System.Web.Extensions/run-tests.cmd
+++ b/mcs/class/System.Web.Extensions/run-tests.cmd
@@ -1,114 +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\r
-goto loop\r
-:break\r
+call run-tests-nunit.bat\r
 \r
-rem SETUP ENVIRONMENT FOR RUNNING SELENIUM TESTS\r
-rem ============================================\r
-set VMW_HOME=C:\Program Files\Mainsoft for Java EE\r
-set SELENIUM_HOME=C:\Mainsoft\runtime\Tools\selenium\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" "Test\standalone\Sys.WebForms" "Test\standalone\System.Web.UI" >>%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\standalone\AUT\r
-echo Building %cd%\AUT.csproj\r
-msbuild AUT.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 ../MainsoftTests/System.Web.UI/UpdatePanel/UpdatePanelTestSuite.html\r
-call :executeTestSuite ../MainsoftTests/Sys.WebForms/PageRequestManager/PageRequestManagerTestSuite.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