Merge pull request dotnet#1107 from krk/master

ObjectDisposedException handled in test wrapper.
DrewScoggins · Jun 17, 2015 · dcc0795 · dcc0795
2 parents 5f62317 + 2b004dd
commit dcc0795
Showing 1 changed file with 17 additions and 2 deletions.
diff --git 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 @@ public int RunTest(string cmdLine, string outputfile, string errorfile)
                     {
                         if (e.Data == null)
                         {
-                            outputWaitHandle.Set();
+                            try
+                            {
+                                outputWaitHandle.Set();
+                            }
+                            catch (ObjectDisposedException)
+                            {
+                                // Noop for access after timeout.
+                            }
                         }
                         else
                         {
@@ -49,7 +57,14 @@ public int RunTest(string cmdLine, string outputfile, string errorfile)
                     {
                         if (e.Data == null)
                         {
-                            errorWaitHandle.Set();
+                            try
+                            {
+                                errorWaitHandle.Set();
+                            }
+                            catch (ObjectDisposedException)
+                            {
+                                // Noop for access after timeout.
+                            }
                         }
                         else
                         {