summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2017-12-20 13:37:02 -0800
committerBruce Forstall <brucefo@microsoft.com>2017-12-20 13:37:02 -0800
commit7a87eb21c63e8894d4c885594882b00d5da1c543 (patch)
treee52f77a810256964a960cdf79d7a2c0b9ecfb706 /tests
parent0500671ff7a6a9248771c25f9f9780858af6f6e4 (diff)
downloadcoreclr-7a87eb21c63e8894d4c885594882b00d5da1c543.tar.gz
coreclr-7a87eb21c63e8894d4c885594882b00d5da1c543.tar.bz2
coreclr-7a87eb21c63e8894d4c885594882b00d5da1c543.zip
Fix per-test timeout
1. Add "timeout" option to runtest.cmd to set the per-test timeout, in ms. 2. Change NETCI to use this new option. This should fix various random test failures that frequently occur in Debug test runs due to timeout (e.g., chaos and type generator tests).
Diffstat (limited to 'tests')
-rw-r--r--tests/runtest.cmd5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index 6774a65070..d98cdbbf8e 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -110,6 +110,7 @@ if /i "%1" == "runcrossgentests" (set RunCrossGen=true&shift&goto Arg_Loop)
if /i "%1" == "link" (set DoLink=true&set ILLINK=%2&shift&shift&goto Arg_Loop)
if /i "%1" == "tieredcompilation" (set COMPLUS_EXPERIMENTAL_TieredCompilation=1&shift&goto Arg_Loop)
if /i "%1" == "gcname" (set COMPlus_GCName=%2&shift&shift&goto Arg_Loop)
+if /i "%1" == "timeout" (set __TestTimeout=%2&shift&shift&goto Arg_Loop)
REM change it to COMPlus_GCStress when we stop using xunit harness
if /i "%1" == "gcstresslevel" (set __GCSTRESSLEVEL=%2&set __TestTimeout=1800000&shift&shift&goto Arg_Loop)
@@ -500,7 +501,9 @@ echo 4: GC on every allowable JITed instruction
echo 8: GC on every allowable NGEN instruction
echo 16: GC only on a unique stack trace
echo tieredcompilation - Run the tests with COMPlus_EXPERIMENTAL_TieredCompilation=1
-echo gcname ^<n^> - Runs the tests with COMPlus_GCName=n
+echo gcname ^<name^> - Runs the tests with COMPlus_GCName=name
+echo timeout ^<n^> - Sets the per-test timeout in milliseconds ^(default is 10 minutes = 10 * 60 * 1000 = 600000^).
+echo Note: some options override this ^(gcstresslevel, longgc, gcsimulator^).
echo msbuildargs ^<args...^> - Pass all subsequent args directly to msbuild invocations.
echo ^<CORE_ROOT^> - Path to the runtime to test (if specified).
echo.