X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2Frun-XSLT-tests.bat;h=5322a17d980e46829c4f4348699ba059d90e75fd;hb=6b79b6c14d321f1e7cc8cd9727e4ce4df02bf96a;hp=c9350ca5a48184d27dc283c8a461389369afca4a;hpb=236370d0782542ae9e017d0c267ba50e4046c700;p=mono.git

diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index c9350ca5a48..5322a17d980 100644
--- a/mcs/class/System.XML/run-XSLT-tests.bat
+++ b/mcs/class/System.XML/run-XSLT-tests.bat
@@ -24,24 +24,30 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.XML.XSLT
+set OUTPUT_FILE_PREFIX=System_XML_XSLT
 set RUNNING_FIXTURE=MonoTests.oasis_xslt.SuiteBuilder
 set TEST_SOLUTION=xslt20.J2EE.sln
 set TEST_ASSEMBLY=xslt.jar
 set PROJECT_CONFIGURATION=Debug_Java20
 
 
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%
-set TIMEL=%time:~0,2%_%time:~3,2%
-set TIMESTAMP=%DATEL%_%TIMEL%
+set startDate=%date%
+set startTime=%time%
+set sdy=%startDate:~10%
+set /a sdm=1%startDate:~4,2% - 100
+set /a sdd=1%startDate:~7,2% - 100
+set /a sth=%startTime:~0,2%
+set /a stm=1%startTime:~3,2% - 100
+set /a sts=1%startTime:~6,2% - 100
+set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%
 
 
 REM ********************************************************
 REM @echo Set environment
 REM ********************************************************
 
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
-set JAVA_HOME=%VMW_HOME%\jre5
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\
+set JAVA_HOME=%VMW_HOME%\jre
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
@@ -49,9 +55,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
 set NUNIT_OPTIONS=/include=Clean
 
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log
+if "%GH_VERSION%"=="" (
+	set GH_VERSION=0_0_0_0
+)
+
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml
+set BUILD_LOG=%COMMON_PREFIX%.build.log
+set RUN_LOG=%COMMON_PREFIX%.run.log
 
 set NUNIT_PATH=..\..\..\..\..\nunit20\
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar
@@ -84,7 +95,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 unzip -un xslt-testsuite-03.ZIP
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 del xslt-reference-results.tar.gz
-wget http://svn.myrealbox.com/source/trunk/release/test-ext/xslt-standalone/xslt-reference-results.tar.gz
+wget http://anonsvn.mono-project.com/source/trunk/release/test-ext/xslt-standalone/xslt-reference-results.tar.gz
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 tar -xzf xslt-reference-results.tar.gz
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -134,10 +145,21 @@ REM ********************************************************
 @echo Build XmlTool
 REM ********************************************************
 set XML_TOOL_PATH=..\..\tools\mono-xmltool
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
+
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
 
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
+goto XMLTOOLREADY
+
+:XMLTOOLSKIP
+echo Skipping XmlToll build...
+
+:XMLTOOLREADY
+set XMLTOOL_BUILD=DONE
+
 copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
 copy %XML_TOOL_PATH%\nunit_transform.xslt .