Fix log file names for TARGET_JVM.

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

diff --git a/mcs/class/System.DirectoryServices/run-tests.bat b/mcs/class/System.DirectoryServices/run-tests.bat
index 0c6e69950d0400c914d8ea59d0d20756cd87bc7d..b4a474b52e482d12613f88954c6c30c6a8fe9074 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=MonoTests.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.MonoTests\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 252515ea29ad4ba16dfb344c2159104e0fcbb022..15d77960b79717abe23ed580520decc8c3448279 100644 (file)
--- a/mcs/class/System.DirectoryServices/run-tests.test.bat
+++ b/mcs/class/System.DirectoryServices/run-tests.test.bat
@@ -114,7 +114,7 @@ msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe .\r
+copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt .\r
 \r
 REM ********************************************************\r