diff options
| author | Andy Ayers <andya@microsoft.com> | 2015-06-17 12:48:04 -0700 |
|---|---|---|
| committer | Andy Ayers <andya@microsoft.com> | 2015-06-17 12:48:04 -0700 |
| commit | dcc07956710998ad28eb2267bc7b3273ecc1dda8 (patch) | |
| tree | 8151155ebc8824d1c35e637c23559f520ead5ef6 /tests | |
| parent | 5f6231754612ed7bf474cc210a1b29d103e4bd63 (diff) | |
| parent | 2b004ddb42a8826cd974860c0d2a64d4243b9bad (diff) | |
| download | coreclr-dcc07956710998ad28eb2267bc7b3273ecc1dda8.tar.gz coreclr-dcc07956710998ad28eb2267bc7b3273ecc1dda8.tar.bz2 coreclr-dcc07956710998ad28eb2267bc7b3273ecc1dda8.zip | |
Merge pull request #1107 from krk/master
ObjectDisposedException handled in test wrapper.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs index 918bbac42f..ad828e895f 100644 --- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs +++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -38,7 +39,14 @@ namespace CoreclrTestLib { if (e.Data == null) { - outputWaitHandle.Set(); + try + { + outputWaitHandle.Set(); + } + catch (ObjectDisposedException) + { + // Noop for access after timeout. + } } else { @@ -49,7 +57,14 @@ namespace CoreclrTestLib { if (e.Data == null) { - errorWaitHandle.Set(); + try + { + errorWaitHandle.Set(); + } + catch (ObjectDisposedException) + { + // Noop for access after timeout. + } } else { |