Skip to content

Fix the stackoverflow test output checks #35914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janvorli merged 2 commits into from
May 7, 2020
Merged

Fix the stackoverflow test output checks #35914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7baab
Fix the stackoverflow test output checks
janvorli May 6, 2020
8f33961
Add NoInlining attribute and do a little unification
janvorli May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/coreclr/tests/src/baseservices/exceptions/stackoverflow/stackoverflow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.
using System;
using System.Threading;
using System.Runtime.CompilerServices;

namespace TestStackOverflow
{
Expand Down Expand Up @@ -67,39 +68,47 @@ struct LargeStruct65536
}
class Program
{
[MethodImpl(MethodImplOptions.NoInlining)]
static void InfiniteRecursionA()
{
InfiniteRecursionB();
}

[MethodImpl(MethodImplOptions.NoInlining)]
static void InfiniteRecursionB()
{
InfiniteRecursionC();
}

[MethodImpl(MethodImplOptions.NoInlining)]
static void InfiniteRecursionC()
{
InfiniteRecursionA();
}

[MethodImpl(MethodImplOptions.NoInlining)]
static void InfiniteRecursionA2()
{
LargeStruct65536 s;
InfiniteRecursionB2();
}

[MethodImpl(MethodImplOptions.NoInlining)]
static void InfiniteRecursionB2()
{
LargeStruct65536 s;
InfiniteRecursionC2();
}

[MethodImpl(MethodImplOptions.NoInlining)]
static void InfiniteRecursionC2()
{
LargeStruct65536 s;
InfiniteRecursionA2();
}

static void MainThreadTest(bool smallframe)
[MethodImpl(MethodImplOptions.NoInlining)]
static void Test(bool smallframe)
{
if (smallframe)
{
Expand All @@ -116,16 +125,7 @@ static void SecondaryThreadsTest(bool smallframe)
Thread[] threads = new Thread[32];
for (int i = 0; i < threads.Length; i++)
{
threads[i] = new Thread(() => {
if (smallframe)
{
InfiniteRecursionA();
}
else
{
InfiniteRecursionA2();
}
});
threads[i] = new Thread(() => Test(smallframe));
threads[i].Start();
}

Expand All @@ -144,7 +144,7 @@ static void Main(string[] args)
}
else if (args[1] == "main")
{
MainThreadTest(smallframe);
Test(smallframe);
}
}
}
Expand Down
18 changes: 12 additions & 6 deletions src/coreclr/tests/src/baseservices/exceptions/stackoverflow/stackoverflowtester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ static bool TestStackOverflowSmallFrameMainThread()
return false;
}

if (!lines.Exists(elem => elem.EndsWith("TestStackOverflow.Program.Test(Boolean)")))
{
Console.WriteLine("Missing \"Test\" method frame");
return false;
}

if (!lines.Exists(elem => elem.EndsWith("at TestStackOverflow.Program.InfiniteRecursionA()")))
{
Console.WriteLine("Missing \"InfiniteRecursionA\" method frame");
Expand Down Expand Up @@ -112,9 +118,9 @@ static bool TestStackOverflowLargeFrameMainThread()
return false;
}

if (!lines.Exists(elem => elem.EndsWith("TestStackOverflow.Program.MainThreadTest(Boolean)")))
if (!lines.Exists(elem => elem.EndsWith("TestStackOverflow.Program.Test(Boolean)")))
{
Console.WriteLine("Missing \"MainThreadTest\" method frame");
Console.WriteLine("Missing \"Test\" method frame");
return false;
}

Expand Down Expand Up @@ -147,9 +153,9 @@ static bool TestStackOverflowSmallFrameSecondaryThread()
List<string> lines;
if (TestStackOverflow("stackoverflow", "smallframe secondary", out lines))
{
if (!lines[lines.Count - 1].EndsWith("at System.Threading.ThreadHelper.ThreadStart()"))
if (!lines.Exists(elem => elem.EndsWith("at TestStackOverflow.Program.Test(Boolean)")))
{
Console.WriteLine("Missing \"System.Threading.ThreadHelper.ThreadStart\" method frame at the last line");
Console.WriteLine("Missing \"TestStackOverflow.Program.Test\" method frame");
return false;
}

Expand Down Expand Up @@ -182,9 +188,9 @@ static bool TestStackOverflowLargeFrameSecondaryThread()
List<string> lines;
if (TestStackOverflow("stackoverflow", "largeframe secondary", out lines))
{
if (!lines[lines.Count - 1].EndsWith("at System.Threading.ThreadHelper.ThreadStart()"))
if (!lines.Exists(elem => elem.EndsWith("at TestStackOverflow.Program.Test(Boolean)")))
{
Console.WriteLine("Missing \"System.Threading.ThreadHelper.ThreadStart\" method frame at the last line");
Console.WriteLine("Missing \"TestStackOverflow.Program.Test\" method frame");
return false;
}

Expand Down