Log files naming fix.

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

diff --git a/mcs/class/System.Configuration/ChangeLog b/mcs/class/System.Configuration/ChangeLog
index 5af3c2acc56b21bed60f7f2927d6ff69e827e19f..e1eaf1f639f6b572579a51d7a40b8f1a3eced033 100644 (file)
--- a/mcs/class/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.test.bat : log files naming fix.
+
 2006-05-09     Boris Kirzner <borisk@mainsoft.com>
 
        * run-tests.test.bat : small fixes for TARGET_JVM.

diff --git a/mcs/class/System.Configuration/run-tests.test.bat b/mcs/class/System.Configuration/run-tests.test.bat
index 7992a1a19c03141f815fc4eaf11596850fc7c9b2..3983971545ce5ca9911f5ffeb81d0a64f460e902 100644 (file)
--- a/mcs/class/System.Configuration/run-tests.test.bat
+++ b/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

diff --git a/mcs/class/System.Data.OracleClient/ChangeLog b/mcs/class/System.Data.OracleClient/ChangeLog
index cc53864b8241a3798633ca0408046bde8f04b8d6..02d7c90eb43b3faf3b9db4b89e5b47c400fad0d2 100644 (file)
--- a/mcs/class/System.Data.OracleClient/ChangeLog
+++ b/mcs/class/System.Data.OracleClient/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.test.bat: log files naming fix.
+
 2006-09-12     Boris Kirzner <borisk@mainsoft.com>
 
        * run-tests.test.bat: small fixes for TARGET_JVM test scripts.

diff --git a/mcs/class/System.Data.OracleClient/run-tests.test.bat b/mcs/class/System.Data.OracleClient/run-tests.test.bat
index c3195d3fec989caf99b840def9d0ad3ec3042ff4..7ad4ce57624506d1f0c7d746626e4d6929a840c5 100644 (file)
--- a/mcs/class/System.Data.OracleClient/run-tests.test.bat
+++ b/mcs/class/System.Data.OracleClient/run-tests.test.bat
@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=System.Data.OracleClient\r
+set OUTPUT_FILE_PREFIX=System_Data_OracleClient\r
 set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient\r
 set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln\r
 set TEST_ASSEMBLY=System.Data.OracleClient.Tests20.J2EE.jar\r
@@ -38,9 +38,15 @@ set PROJECT_CONFIGURATION=Debug_Java20
 set APP_CONFIG_FILE=Test\System.Data.OracleClient.J2EE.config\r
 \r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -61,9 +67,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\ojdbc14.jar
 \r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
index 2ee3aa46b2e0d9b3407bdfaaa86328b12c7e2aeb..870da2c63b540882ce4ae921980dbc37476f6d8a 100644 (file)
--- a/mcs/class/System.Data/ChangeLog
+++ b/mcs/class/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.test.disconnected.bat,run-tests.test.connected.bat: 
+       log files naming fix.
+
 2006-09-17     Boris Kirzner <borisk@mainsoft.com>
 
        * run-tests.test.disconnected.bat : added usage of app config.

diff --git a/mcs/class/System.Data/run-tests.test.connected.bat b/mcs/class/System.Data/run-tests.test.connected.bat
index be0eacf5f09d9d94c0c5719456d21532c15b786b..1cdb66882942543679ea66a0033d66dd611a406c 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.connected.bat
+++ b/mcs/class/System.Data/run-tests.test.connected.bat
@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=System.Data.connected\r
+set OUTPUT_FILE_PREFIX=System_Data_connected\r
 set RUNNING_FIXTURE=MonoTests.System.Data\r
 set TEST_SOLUTION=Test\ProviderTests\System.Data.OleDb.Tests20.J2EE.sln\r
 set TEST_ASSEMBLY=System.Data.OleDb.Tests.J2EE.jar\r
@@ -38,9 +38,15 @@ set PROJECT_CONFIGURATION=Debug_Java20
 set APP_CONFIG_FILE=Test\ProviderTests\System.Data.OleDb.J2EE.config\r
 \r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -71,9 +77,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%GHROOT%\jgac\jdbc\db2jcc_license_cu.j
 \r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.Data/run-tests.test.disconnected.bat b/mcs/class/System.Data/run-tests.test.disconnected.bat
index 1b58d566ec04bc897919c4ebc6c189cc5bf50a2b..3bd256e6ffc5c57e62452d1857467d2bde0a1025 100644 (file)
--- a/mcs/class/System.Data/run-tests.test.disconnected.bat
+++ b/mcs/class/System.Data/run-tests.test.disconnected.bat
@@ -30,7 +30,7 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=System.Data.disconnected\r
+set OUTPUT_FILE_PREFIX=System_Data_disconnected\r
 set RUNNING_FIXTURE=MonoTests.System.Data\r
 set TEST_SOLUTION=Test\System.Data.Test20.sln\r
 set TEST_ASSEMBLY=System.Data.Test.jar\r
@@ -38,9 +38,15 @@ set PROJECT_CONFIGURATION=Debug_Java20
 set APP_CONFIG_FILE=app_test_2.0.config\r
 \r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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 NUNIT_OPTIONS=/exclude:NotWorking,ValueAdd,CAS,InetAccess\r
 \r
@@ -59,9 +65,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.DirectoryServices/ChangeLog b/mcs/class/System.DirectoryServices/ChangeLog
index 9536de2d99884cb5116a59927095869bedb9500e..3fac83b59942f93ccde5ded2fa6cf975a1df8ed2 100644 (file)
--- a/mcs/class/System.DirectoryServices/ChangeLog
+++ b/mcs/class/System.DirectoryServices/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>\r
+\r
+       * run-tests.bat,run-tests.test.bat: log files naming fix.\r
+\r
 2006-13-09     Boris Kirzner <borisk@mainsoft.com>\r
 \r
        * run-tests.test.bat: small fixes for TARGET_JVM test scripts.\r

diff --git a/mcs/class/System.DirectoryServices/run-tests.bat b/mcs/class/System.DirectoryServices/run-tests.bat
index b4a474b52e482d12613f88954c6c30c6a8fe9074..937672879c2f82f4eeddde3f019caefcea66c165 100644 (file)
--- a/mcs/class/System.DirectoryServices/run-tests.bat
+++ b/mcs/class/System.DirectoryServices/run-tests.bat
@@ -15,13 +15,13 @@ IF "%1"=="" (
 )\r
 \r
 set SECURE_MODE=nonsecure\r
-set OUTPUT_FILE_PREFIX=System.DirectoryServices\r
+set OUTPUT_FILE_PREFIX=System_DirectoryServices\r
 set RUNNING_FIXTURE=MonoTests.System.DirectoryServices\r
 \r
 call run-tests.test.bat %BUILD_OPTION% %SECURE_MODE% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE%\r
 \r
 set SECURE_MODE=secure\r
-set OUTPUT_FILE_PREFIX=System.DirectoryServices\r
+set OUTPUT_FILE_PREFIX=System_DirectoryServices\r
 set RUNNING_FIXTURE=MonoTests.System.DirectoryServices\r
 \r
 REM call run-tests.test.bat %BUILD_OPTION% %SECURE_MODE% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE%
\ No newline at end of file

diff --git a/mcs/class/System.DirectoryServices/run-tests.test.bat b/mcs/class/System.DirectoryServices/run-tests.test.bat
index 504f1463c05538ad2847388d6acc755c5e06a595..aa1febc7f10cba570fbee06a0d4a14fad80bceff 100644 (file)
--- a/mcs/class/System.DirectoryServices/run-tests.test.bat
+++ b/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\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
-set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%.%SECURE_MODE%\r
+set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%_%SECURE_MODE%\r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -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;\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.Drawing/ChangeLog b/mcs/class/System.Drawing/ChangeLog
index 358be5ab3fc47c2bbdf949c7ed3eb5db9ccd49fc..925b49fe7d14ade55ebe41d3136105e52a73ece2 100644 (file)
--- a/mcs/class/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.bat,run-tests.test.bat: log files naimng fix.
+
 2006-09-18     Boris Kirzner <borisk@mainsoft.com>
 
        * run-tests.test.bat : fixes for TARGET_JVM tests run script.

diff --git a/mcs/class/System.Drawing/run-tests.bat b/mcs/class/System.Drawing/run-tests.bat
index 5dd1f94a1571ac862d65da9ff3af0083ef0164dc..c1171713089b870eb8e814547b4900d170aa0e2b 100644 (file)
--- a/mcs/class/System.Drawing/run-tests.bat
+++ b/mcs/class/System.Drawing/run-tests.bat
@@ -15,7 +15,7 @@ IF "%1"=="" (
 )\r
        \r
 IF "%2"=="" (\r
-       set OUTPUT_FILE_PREFIX=System.Drawing\r
+       set OUTPUT_FILE_PREFIX=System_Drawing_MonoTests\r
 ) ELSE (\r
        set OUTPUT_FILE_PREFIX=%2\r
 )\r
@@ -36,7 +36,7 @@ IF "%1"=="" (
 )\r
        \r
 IF "%2"=="" (\r
-       set OUTPUT_FILE_PREFIX=System.Drawing\r
+       set OUTPUT_FILE_PREFIX=System_Drawing_Test\r
 ) ELSE (\r
        set OUTPUT_FILE_PREFIX=%2\r
 )\r

diff --git a/mcs/class/System.Drawing/run-tests.test.bat b/mcs/class/System.Drawing/run-tests.test.bat
index d9d7fac5bdaa0e1e48ef6e36f68db65243d2ca19..5d63648bf42e7d19dcb79f28f12b079141b0e676 100644 (file)
--- a/mcs/class/System.Drawing/run-tests.test.bat
+++ b/mcs/class/System.Drawing/run-tests.test.bat
@@ -43,9 +43,15 @@ set PROJECT_J2EE_CONFIGURATION=Debug_Java20
 set PROJECT_NET_CONFIGURATION=Debug\r
 set NUNIT_CONSOLE_PATH="C:\Program Files\NUnit-Net-2.0 2.2.8\bin"\r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -63,10 +69,11 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%jai_imageio.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Drawing.jar;\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.GH.xml\r
-set NET_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.%RUNNING_FIXTURE%.Net.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set NET_OUTPUT_XML=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.Net.1.%USERNAME%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_J2EE_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 99c85fcb98605594f5d883025c1d8771d31344b7..d82f0272ec93ea8eb20bafb26dcd29df51415910 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-mono-tests.bat: log files naming fix.
+
 2006-09-19 Yoni Klain <yonik@mainsoft.com>
 
     * System.Web_test.dll.sources: add new \System.Web.UI.WebControls\CrossPagePostingTest.cs

diff --git a/mcs/class/System.Web/run-mono-tests.bat b/mcs/class/System.Web/run-mono-tests.bat
index 469f58b8f8585a3d1f50ea161e8bebdb7a0724a6..e11c32ea642be74eeee4749cf02ba4840ae12984 100755 (executable)
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -1,4 +1,4 @@
-@echo oî\r
+@echo ff\r
 REM ********************************************************\r
 REM This batch file receives the follwing parameters:\r
 REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -21,16 +21,22 @@ REM ********************************************************
 REM Set parameters\r
 REM ********************************************************\r
 \r
-set OUTPUT_FILE_PREFIX=System.Web\r
+set OUTPUT_FILE_PREFIX=System_Web\r
 set RUNNING_FIXTURE=System.Web\r
 set TEST_SOLUTION=Test\TestMonoWeb.J2EE20.sln\r
 set TEST_ASSEMBLY=TestMonoWeb.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -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\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.XML/ChangeLog b/mcs/class/System.XML/ChangeLog
index 6202b49b83f6abdbd1a5e4bea6258147b60222f6..cb81d37b529be4127bfce5f450b65299fda8d8de 100644 (file)
--- a/mcs/class/System.XML/ChangeLog
+++ b/mcs/class/System.XML/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-26     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-W3C-tests.bat, run-XSLT-tests.bat: log files naming fix.
+
 2006-09-13     Boris Kirzner <borisk@mainsoft.com>
        * run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat: 
        reworked test scripts for TARGET_JVM.

diff --git a/mcs/class/System.XML/run-W3C-tests.bat b/mcs/class/System.XML/run-W3C-tests.bat
index 2d90e251829dbc6ec0b4c861dbd2c0a845868b64..19e3c5b200763c28cd3bee3d04787ccc75bc0ec3 100644 (file)
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -24,16 +24,22 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=System.XML.W3C\r
+set OUTPUT_FILE_PREFIX=System_XML_W3C\r
 set RUNNING_FIXTURE=MonoTests.W3C_xmlconf.CleanTests\r
 set TEST_SOLUTION=W3c20.J2EE.sln\r
 set TEST_ASSEMBLY=W3C.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -49,9 +55,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\..\..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r

diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index c9350ca5a48184d27dc283c8a461389369afca4a..27e9c108d55454557337d743b69d645c00f0c690 100644 (file)
--- a/mcs/class/System.XML/run-XSLT-tests.bat
+++ b/mcs/class/System.XML/run-XSLT-tests.bat
@@ -24,16 +24,22 @@ REM Set parameters
 REM ********************************************************\r
 \r
 set BUILD_OPTION=%1\r
-set OUTPUT_FILE_PREFIX=System.XML.XSLT\r
+set OUTPUT_FILE_PREFIX=System_XML_XSLT\r
 set RUNNING_FIXTURE=MonoTests.oasis_xslt.SuiteBuilder\r
 set TEST_SOLUTION=xslt20.J2EE.sln\r
 set TEST_ASSEMBLY=xslt.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
 \r
-set DATEL=%date:~10,4%_%date:~4,2%_%date:~7,2%%\r
-set TIMEL=%time:~0,2%_%time:~3,2%\r
-set TIMESTAMP=%DATEL%_%TIMEL%\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
 \r
 REM ********************************************************\r
@@ -49,9 +55,14 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
 set NUNIT_OPTIONS=/include=Clean\r
 \r
-set GH_OUTPUT_XML=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.xml\r
-set BUILD_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.build.log\r
-set RUN_LOG=%TIMESTAMP%.%OUTPUT_FILE_PREFIX%.GH.%RUNNING_FIXTURE%.run.log\r
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
+\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\r
 \r
 set NUNIT_PATH=..\..\..\..\..\nunit20\\r
 set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r