diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-06-09 13:32:31 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-06-15 14:37:29 -0700 |
| commit | 2d58bb520fc8beabddeff1a1ba70438ac4192bf0 (patch) | |
| tree | 37816b45335f7c75bb55265505f56f27ec1bd80e | |
| parent | 8c4dfb133c7a4d162fdd1030c6316397ab6b892d (diff) | |
| download | coreclr-2d58bb520fc8beabddeff1a1ba70438ac4192bf0.tar.gz coreclr-2d58bb520fc8beabddeff1a1ba70438ac4192bf0.tar.bz2 coreclr-2d58bb520fc8beabddeff1a1ba70438ac4192bf0.zip | |
Fix timing issues in some baseservices tests
| -rw-r--r-- | tests/src/CLRTest.CrossGen.targets | 2 | ||||
| -rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 8 | ||||
| -rw-r--r-- | tests/src/CLRTest.Execute.Batch.targets | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/tests/src/CLRTest.CrossGen.targets b/tests/src/CLRTest.CrossGen.targets index 6bb5cdb103..eab4f056fd 100644 --- a/tests/src/CLRTest.CrossGen.targets +++ b/tests/src/CLRTest.CrossGen.targets @@ -103,4 +103,4 @@ if defined RunCrossGen ( -</Project> +</Project>
\ No newline at end of file diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index a5727414b0..10f4aa612d 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/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/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets index 545fc72eb2..dfd87bad5f 100644 --- a/tests/src/CLRTest.Execute.Batch.targets +++ b/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 |