Log files naming fix.

svn path=/trunk/mcs/; revision=65904

mcs/class/System.Configuration/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-tests.test.bat : log files naming fix.
+
 2006-05-09	Boris Kirzner <[email protected]>
 
 	* run-tests.test.bat : small fixes for TARGET_JVM.

mcs/class/System.Configuration/run-tests.test.bat

@@ -30,16 +30,22 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Configuration
+set OUTPUT_FILE_PREFIX=System_Configuration_MonoTests
 set RUNNING_FIXTURE=MonoTests.System.Configuration
 set TEST_SOLUTION=Test\System.Configuration.Test20.sln
 set TEST_ASSEMBLY=System.Configuration.Test20.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 ********************************************************
@@ -56,9 +62,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Configuration.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-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

mcs/class/System.Data.OracleClient/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-tests.test.bat: log files naming fix.
+
 2006-09-12	Boris Kirzner <[email protected]>
 
 	* run-tests.test.bat: small fixes for TARGET_JVM test scripts.

mcs/class/System.Data.OracleClient/run-tests.test.bat

@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Data.OracleClient
+set OUTPUT_FILE_PREFIX=System_Data_OracleClient
 set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient
 set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln
 set TEST_ASSEMBLY=System.Data.OracleClient.Tests20.J2EE.jar
@@ -38,9 +38,15 @@ set PROJECT_CONFIGURATION=Debug_Java20
 set APP_CONFIG_FILE=Test\System.Data.OracleClient.J2EE.config
 
 
-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 ********************************************************
@@ -61,9 +67,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\ojdbc14.jar
 
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-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

mcs/class/System.Data/ChangeLog

@@ -1,3 +1,8 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-tests.test.disconnected.bat,run-tests.test.connected.bat: 
+	log files naming fix.
+
 2006-09-17	Boris Kirzner <[email protected]>
 
 	* run-tests.test.disconnected.bat : added usage of app config.

mcs/class/System.Data/run-tests.test.connected.bat

@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Data.connected
+set OUTPUT_FILE_PREFIX=System_Data_connected
 set RUNNING_FIXTURE=MonoTests.System.Data
 set TEST_SOLUTION=Test\ProviderTests\System.Data.OleDb.Tests20.J2EE.sln
 set TEST_ASSEMBLY=System.Data.OleDb.Tests.J2EE.jar
@@ -38,9 +38,15 @@ set PROJECT_CONFIGURATION=Debug_Java20
 set APP_CONFIG_FILE=Test\ProviderTests\System.Data.OleDb.J2EE.config
 
 
-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 ********************************************************
@@ -71,9 +77,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\db2jcc_license_cu.j
 
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-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

mcs/class/System.Data/run-tests.test.disconnected.bat

@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.Data.disconnected
+set OUTPUT_FILE_PREFIX=System_Data_disconnected
 set RUNNING_FIXTURE=MonoTests.System.Data
 set TEST_SOLUTION=Test\System.Data.Test20.sln
 set TEST_ASSEMBLY=System.Data.Test.jar
@@ -38,9 +38,15 @@ set PROJECT_CONFIGURATION=Debug_Java20
 set APP_CONFIG_FILE=app_test_2.0.config
 
 
-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%
 
 set NUNIT_OPTIONS=/exclude:NotWorking,ValueAdd,CAS,InetAccess
 
@@ -59,9 +65,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-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

mcs/class/System.DirectoryServices/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-tests.bat,run-tests.test.bat: log files naming fix.
+
 2006-13-09	Boris Kirzner <[email protected]>
 
 	* run-tests.test.bat: small fixes for TARGET_JVM test scripts.

mcs/class/System.DirectoryServices/run-tests.bat

@@ -15,13 +15,13 @@ IF "%1"=="" (
 )
 
 set SECURE_MODE=nonsecure
-set OUTPUT_FILE_PREFIX=System.DirectoryServices
+set OUTPUT_FILE_PREFIX=System_DirectoryServices
 set RUNNING_FIXTURE=MonoTests.System.DirectoryServices
 
 call run-tests.test.bat %BUILD_OPTION% %SECURE_MODE% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE%
 
 set SECURE_MODE=secure
-set OUTPUT_FILE_PREFIX=System.DirectoryServices
+set OUTPUT_FILE_PREFIX=System_DirectoryServices
 set RUNNING_FIXTURE=MonoTests.System.DirectoryServices
 
 REM call run-tests.test.bat %BUILD_OPTION% %SECURE_MODE% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE%

mcs/class/System.DirectoryServices/run-tests.test.bat

@@ -36,11 +36,17 @@ set TEST_SOLUTION=Test\System.DirectoryServices.Test20.sln
 set TEST_ASSEMBLY=System.DirectoryServices.Test20.jar
 set PROJECT_CONFIGURATION=Debug_Java20
 
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.%SECURE_MODE%
+set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%_%SECURE_MODE%
 
-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 ********************************************************
@@ -59,9 +65,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.DirectoryServices.ja
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%Novell.Directory.Ldap.jar;
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-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

mcs/class/System.Drawing/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-tests.bat,run-tests.test.bat: log files naimng fix.
+
 2006-09-18	Boris Kirzner <[email protected]>
 
 	* run-tests.test.bat : fixes for TARGET_JVM tests run script.

mcs/class/System.Drawing/run-tests.bat

@@ -15,7 +15,7 @@ IF "%1"=="" (
 )
 	
 IF "%2"=="" (
-	set OUTPUT_FILE_PREFIX=System.Drawing
+	set OUTPUT_FILE_PREFIX=System_Drawing_MonoTests
 ) ELSE (
 	set OUTPUT_FILE_PREFIX=%2
 )
@@ -36,7 +36,7 @@ IF "%1"=="" (
 )
 	
 IF "%2"=="" (
-	set OUTPUT_FILE_PREFIX=System.Drawing
+	set OUTPUT_FILE_PREFIX=System_Drawing_Test
 ) ELSE (
 	set OUTPUT_FILE_PREFIX=%2
 )

mcs/class/System.Drawing/run-tests.test.bat

@@ -43,9 +43,15 @@ set PROJECT_J2EE_CONFIGURATION=Debug_Java20
 set PROJECT_NET_CONFIGURATION=Debug
 set NUNIT_CONSOLE_PATH="C:\Program Files\NUnit-Net-2.0 2.2.8\bin"
 
-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 ********************************************************
@@ -63,10 +69,11 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%jai_imageio.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Drawing.jar;
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.xml
-set NET_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.Net.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
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml
+set NET_OUTPUT_XML=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.Net.1.%USERNAME%.xml
+set BUILD_LOG=%COMMON_PREFIX%.build.log
+set RUN_LOG=%COMMON_PREFIX%.run.log
 
 set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.jar

mcs/class/System.Web/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-mono-tests.bat: log files naming fix.
+
 2006-09-19 Yoni Klain <[email protected]>
 
     * System.Web_test.dll.sources: add new \System.Web.UI.WebControls\CrossPagePostingTest.cs

mcs/class/System.Web/run-mono-tests.bat

@@ -1,4 +1,4 @@
-@echo oî
+@echo ff
 REM ********************************************************
 REM This batch file receives the follwing parameters:
 REM build/rebuild (optional): should the solution file be rebuilded 
@@ -21,16 +21,22 @@ REM ********************************************************
 REM Set parameters
 REM ********************************************************
 
-set OUTPUT_FILE_PREFIX=System.Web
+set OUTPUT_FILE_PREFIX=System_Web
 set RUNNING_FIXTURE=System.Web
 set TEST_SOLUTION=Test\TestMonoWeb.J2EE20.sln
 set TEST_ASSEMBLY=TestMonoWeb.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 ********************************************************
@@ -52,9 +58,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\De
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\HtmlCompare.jar
 set NUNIT_OPTIONS=/exclude=NotWorking
 
-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

mcs/class/System.XML/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-26	Boris Kirzner <[email protected]>
+
+	* run-W3C-tests.bat, run-XSLT-tests.bat: log files naming fix.
+
 2006-09-13	Boris Kirzner <[email protected]>
 	* run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat: 
 	reworked test scripts for TARGET_JVM.

mcs/class/System.XML/run-W3C-tests.bat

@@ -24,16 +24,22 @@ REM Set parameters
 REM ********************************************************
 
 set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System.XML.W3C
+set OUTPUT_FILE_PREFIX=System_XML_W3C
 set RUNNING_FIXTURE=MonoTests.W3C_xmlconf.CleanTests
 set TEST_SOLUTION=W3c20.J2EE.sln
 set TEST_ASSEMBLY=W3C.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 ********************************************************
@@ -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=/exclude=NotWorking
 
-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

mcs/class/System.XML/run-XSLT-tests.bat

@@ -24,16 +24,22 @@ 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 ********************************************************
@@ -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