[PATCH v3 0/1] MR3678: Draft: mscoree/tests: Catch expected exception in loadpaths.exe.

[Esme Povirk (＠madewokherd)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54202

I don't have a Windows 7 VM available to test (and I don't see them on Win11), but this should hopefully prevent the crash dialogs from popping up.

--
  v3: mscoree/tests: Catch expected exception in loadpaths.exe.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3678

[PATCH v3 1/1] mscoree/tests: Catch expected exception in loadpaths.exe.

[Esme Povirk]

From: Esme Povirk <esme(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54202
---
 dlls/mscoree/tests/loadpaths.exe.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/mscoree/tests/loadpaths.exe.cs b/dlls/mscoree/tests/loadpaths.exe.cs
index 22c32603c59..298c05c31a2 100644
--- a/dlls/mscoree/tests/loadpaths.exe.cs
+++ b/dlls/mscoree/tests/loadpaths.exe.cs
@@ -16,13 +16,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+using System;
+
 namespace LoadPaths
 {
     public static class Test
+    {
+        public static int RunExternal()
+        {
+            return new Test2().Foo();
+        }
+    }
+
+    public static class MainClass
     {
         static int Main(string[] args)
         {
-	     return new Test2().Foo();
+            try {
+                return Test.RunExternal();
+            }
+            catch {
+                return 1;
+            }
         }
     }
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3678

[Esme Povirk (＠madewokherd)]

This version seemed good in a manual testbot run, so if the MR run looks good too I'll mark it as ready.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3678#note_43738

[PATCH v3 0/1] MR3678: mscoree/tests: Catch expected exception in loadpaths.exe.

[Esme Povirk (＠madewokherd)]

MR testbot run looks good.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3678#note_43740