Skip to content

Commit 3b6cdc2

Browse files
committed
Reflect PR feedback
1 parent 3313937 commit 3b6cdc2

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/coreclr/nativeaot/System.Private.CoreLib/src/System/RuntimeExceptionHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ internal static unsafe void FailFast(string? message, Exception? exception, RhFa
221221
string outputMessage;
222222
if (exception != null)
223223
{
224-
prefix = "Unhandled Exception: ";
224+
prefix = "Unhandled exception. ";
225225
outputMessage = exception.ToString();
226226
}
227227
else

src/tests/baseservices/exceptions/unhandled/unhandled.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static int Main(string[] args)
2424

2525
testProcess.StartInfo.FileName = Environment.ProcessPath;
2626
testProcess.StartInfo.Arguments = Environment.CommandLine + " throw";
27-
testProcess.StartInfo.UseShellExecute = false;
2827
testProcess.StartInfo.RedirectStandardError = true;
2928
testProcess.ErrorDataReceived += (sender, line) =>
3029
{
@@ -41,7 +40,7 @@ static int Main(string[] args)
4140
testProcess.CancelErrorRead();
4241

4342
int expectedExitCode;
44-
if ((Environment.OSVersion.Platform == PlatformID.Unix) || (Environment.OSVersion.Platform == PlatformID.MacOSX))
43+
if (!OperatingSystem.IsWindows())
4544
{
4645
expectedExitCode = 128 + 6;
4746
}
@@ -60,7 +59,7 @@ static int Main(string[] args)
6059
return 101;
6160
}
6261

63-
if (Regex.Match(lines[0], @"Unhandled exception[.:] System\.Exception\: Test", RegexOptions.IgnoreCase) == Match.Empty)
62+
if (lines[0] != "Unhandled exception. System.Exception: Test")
6463
{
6564
Console.WriteLine("Missing Unhandled exception header");
6665
return 102;

0 commit comments

Comments
 (0)