Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 151e16c

Browse files
author
jashoo
committed
Up the default timeout for GCStress
1 parent a576c83 commit 151e16c

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

netci.groovy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ def static genStressModeScriptStep(def os, def stressModeName, def stressModeVar
173173
if (os == 'Windows_NT') {
174174
stepScript += "echo Creating TestEnv Script for ${stressModeName}\r\n"
175175
stepScript += "del ${stepScriptLocation}\r\n"
176+
177+
// Timeout in ms, default is 10 minutes. For stress
178+
// modes up this to 30 minutes
179+
def timeout = 1800000
180+
181+
// Set the Timeout
182+
stepScript += "set __TestTimeout=${timeout}\r\n"
176183
stressModeVars.each{ k, v ->
177184
// Write out what we are writing to the script file
178185
stepScript += "echo Setting ${k}=${v}\r\n"

tests/runtest.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if /i "%1" == "GenerateLayoutOnly" (set __GenerateLayoutOnly=1&set __SkipWrap
6767
if /i "%1" == "PerfTests" (set __PerfTests=true&set __SkipWrapperGeneration=true&shift&goto Arg_Loop)
6868
if /i "%1" == "runcrossgentests" (set RunCrossGen=true&shift&goto Arg_Loop)
6969
REM change it to COMPlus_GCStress when we stop using xunit harness
70-
if /i "%1" == "gcstresslevel" (set __GCSTRESSLEVEL=%2&shift&shift&goto Arg_Loop)
70+
if /i "%1" == "gcstresslevel" (set __GCSTRESSLEVEL=%2&set __TestTimeout=1800000&shift&shift&goto Arg_Loop)
7171

7272
if /i not "%1" == "msbuildargs" goto SkipMsbuildArgs
7373
:: All the rest of the args will be collected and passed directly to msbuild.

tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public class CoreclrTestWrapperLib
1717
{
1818
public const int EXIT_SUCCESS_CODE = 0;
1919
public const string TIMEOUT_ENVIRONMENT_VAR = "__TestTimeout";
20+
21+
// Default timeout set to 10 minutes
2022
public const int DEFAULT_TIMEOUT = 1000 * 60*10;
2123
public const string GC_STRESS_LEVEL = "__GCSTRESSLEVEL";
2224

0 commit comments

Comments
 (0)