Author: borisk
Date: 2006-09-11 09:52:44 -0400 (Mon, 11 Sep 2006)
New Revision: 65229
Modified:
trunk/mcs/class/System.DirectoryServices/ChangeLog
trunk/mcs/class/System.DirectoryServices/Test/System.DirectoryServices.Test20.vmwcsproj
trunk/mcs/class/System.DirectoryServices/run-tests.test.bat
Log:
Added timestamp to log file names.
Modified: trunk/mcs/class/System.DirectoryServices/ChangeLog
===================================================================
--- trunk/mcs/class/System.DirectoryServices/ChangeLog 2006-09-11 13:49:36 UTC
(rev 65228)
+++ trunk/mcs/class/System.DirectoryServices/ChangeLog 2006-09-11 13:52:44 UTC
(rev 65229)
@@ -1,3 +1,7 @@
+2006-11-09 Boris Kirzner <[EMAIL PROTECTED]>
+
+ * run-tests.test.bat: added timestamp to log file namies.
+
2006-05-16 Vladimir Krasnov <[EMAIL PROTECTED]>
* run-tests.test.bat: skip nunit build if already done
Modified:
trunk/mcs/class/System.DirectoryServices/Test/System.DirectoryServices.Test20.vmwcsproj
===================================================================
---
trunk/mcs/class/System.DirectoryServices/Test/System.DirectoryServices.Test20.vmwcsproj
2006-09-11 13:49:36 UTC (rev 65228)
+++
trunk/mcs/class/System.DirectoryServices/Test/System.DirectoryServices.Test20.vmwcsproj
2006-09-11 13:52:44 UTC (rev 65229)
@@ -104,9 +104,6 @@
<Name>nunit.framework.dll20.J2EE</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <Content Include="System.DirectoryServices\App.config" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
<Import Project="$(GHROOT)\bin\Mainsoft.Common.targets" />
<!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
@@ -118,7 +115,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-system-directoryservices="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\System.DirectoryServices.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\Novell.Directory.Ldap.jar"
REFS-JarPath-rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE 2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" />
+ <UserProperties
REFS-JarPath-system-directoryservices="..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\System.DirectoryServices.jar;..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE
V2\jgac\vmw4j2ee_110\Novell.Directory.Ldap.jar"
REFS-JarPath-rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar" />
</VisualStudio>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/mcs/class/System.DirectoryServices/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.DirectoryServices/run-tests.test.bat 2006-09-11
13:49:36 UTC (rev 65228)
+++ trunk/mcs/class/System.DirectoryServices/run-tests.test.bat 2006-09-11
13:52:44 UTC (rev 65229)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] on
[EMAIL PROTECTED] off
REM ********************************************************
REM This batch file receives the follwing parameters:
REM build/rebuild (optional): should the solution file be rebuilded
@@ -31,7 +31,11 @@
set TEST_ASSEMBLY=System.DirectoryServices.Test20.jar
set PROJECT_CONFIGURATION=Debug_Java20
+set DATEL=%date:~4,2%_%date:~7,2%_%date:~10,4%
+set TIMEL=%time:~0,2%_%time:~3,2%
+set TIMESTAMP=%DATEL%_%TIMEL%
+
REM ********************************************************
REM @echo Set environment
REM ********************************************************
@@ -41,7 +45,7 @@
set
RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.DirectoryServices.jar;%JGAC_PATH%Novell.Directory.Ldap.jar;%JGAC_PATH%J2SE.Helpers.jar
set NUNIT_OPTIONS=/exclude=NotWorking
-set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.%SECURE_MODE%.xml
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.%SECURE_MODE%.%TIMESTAMP%.xml
set NUNIT_PATH=%BACK_TO_ROOT_DIR%..\..\nunit20\
set
NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar;.
@@ -53,7 +57,7 @@
REM ********************************************************
rem devenv Test\System.DirectoryServices.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %TEST_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION%
>>%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -64,7 +68,7 @@
if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
rem devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION%
>>%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt 2<&1
goto NUNITREADY
@@ -95,7 +99,7 @@
)
REM @echo on
-"%JAVA_HOME%\bin\java" %JVM_OPTIONS% -cp %CLASSPATH% NUnit.Console.ConsoleUi
%TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS%
/xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1
+"%JAVA_HOME%\bin\java" %JVM_OPTIONS% -cp %CLASSPATH% NUnit.Console.ConsoleUi
%TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE% %NUNIT_OPTIONS%
/xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt 2<&1
REM @echo off
@@ -104,7 +108,7 @@
REM ********************************************************
set XML_TOOL_PATH=..\..\tools\mono-xmltool
rem devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java
>>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION%
>>%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
@@ -118,6 +122,10 @@
xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
REM @echo off
+copy %RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt ..\
+copy %GH_OUTPUT_XML% ..\
+
+
:FINALLY
GOTO END
@@ -126,12 +134,12 @@
GOTO END
:BUILD_EXCEPTION
[EMAIL PROTECTED] Error in building solutions. See
%RUNNING_FIXTURE%_build.log.txt for details...
[EMAIL PROTECTED] Error in building solutions. See
%RUNNING_FIXTURE%_build.log.%TIMESTAMP%.txt for details...
REM EXIT 1
GOTO END
:RUN_EXCEPTION
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See
%RUNNING_FIXTURE%_run.log.txt for details...
[EMAIL PROTECTED] Error in running fixture %RUNNING_FIXTURE%. See
%RUNNING_FIXTURE%_run.log.%TIMESTAMP%.txt for details...
REM EXIT 1
GOTO END
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches