projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ec0886)
Fix timing issues in some baseservices tests
authorwtgodbe <wigodbe@microsoft.com>
Fri, 9 Jun 2017 20:32:31 +0000 (13:32 -0700)
committerwtgodbe <wigodbe@microsoft.com>
Thu, 15 Jun 2017 21:37:29 +0000 (14:37 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/2d58bb520fc8beabddeff1a1ba70438ac4192bf0

src/coreclr/tests/src/CLRTest.CrossGen.targets patch | blob | history
src/coreclr/tests/src/CLRTest.Execute.Bash.targets patch | blob | history
src/coreclr/tests/src/CLRTest.Execute.Batch.targets patch | blob | history

diff --git a/src/coreclr/tests/src/CLRTest.CrossGen.targets b/src/coreclr/tests/src/CLRTest.CrossGen.targets
index 6bb5cdb..eab4f05 100644 (file)
--- a/src/coreclr/tests/src/CLRTest.CrossGen.targets
+++ b/src/coreclr/tests/src/CLRTest.CrossGen.targets
@@ -103,4 +103,4 @@ if defined RunCrossGen (
 
 
   
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/CLRTest.Execute.Bash.targets b/src/coreclr/tests/src/CLRTest.Execute.Bash.targets
index a572741..10f4aa6 100644 (file)
--- a/src/coreclr/tests/src/CLRTest.Execute.Bash.targets
+++ b/src/coreclr/tests/src/CLRTest.Execute.Bash.targets
@@ -255,9 +255,15 @@ fi
 ExePath=$(InputAssemblyName)
 $(BashLinkerTestLaunchCmds)
 $(BashCLRTestLaunchCmds)
+if [ ! -z ${RunCrossGen+x} ]%3B then
+  TakeLock
+fi
 echo $_DebuggerFullPath $(_CLRTestRunFile) $ExePath $CLRTestExecutionArguments 
 $_DebuggerFullPath $(_CLRTestRunFile) $ExePath $CLRTestExecutionArguments 
 CLRTestExitCode=$?
+if [ ! -z ${RunCrossGen+x} ]%3B then
+  ReleaseLock
+fi
 $(BashLinkerTestCleanupCmds)
       ]]></BashCLRTestLaunchCmds>
       <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'RunOnly'"><![CDATA[
@@ -390,4 +396,4 @@ $(BashCLRTestExitCodeCheck)
       Overwrite="true" />
   </Target>
   
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/CLRTest.Execute.Batch.targets b/src/coreclr/tests/src/CLRTest.Execute.Batch.targets
index 545fc72..dfd87ba 100644 (file)
--- a/src/coreclr/tests/src/CLRTest.Execute.Batch.targets
+++ b/src/coreclr/tests/src/CLRTest.Execute.Batch.targets
@@ -261,9 +261,15 @@ set ExePath=$(InputAssemblyName)
 $(BatchLinkerTestLaunchCmds)
 $(BatchCLRTestLaunchCmds)
 
+if defined RunCrossGen (
+  call :TakeLock
+)
 ECHO %LAUNCHER% %ExePath% %CLRTestExecutionArguments%
 %LAUNCHER% %ExePath% %CLRTestExecutionArguments%
 set CLRTestExitCode=!ERRORLEVEL!
+if defined RunCrossGen (
+  call :ReleaseLock
+)
 $(BatchLinkerTestCleanupCmds)
       ]]></BatchCLRTestLaunchCmds>
 
@@ -385,4 +391,4 @@ $(BatchCLRTestExitCodeCheck)
       Overwrite="true" />
   </Target>
   
-</Project>
+</Project>
\ No newline at end of file
Domain: Dotnet / Core;