Skip to content

Commit 41a3571

Browse files
authored
[acceptance-tests] Run shorter version of GCStress on PRs and update targets (mono#6106)
In 22f0977 it was disabled but we can actually just run a shorter version in PRs. Also reenable the precompilation target for the managed CoreCLR tests.
1 parent 198147a commit 41a3571

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

acceptance-tests/SUBMODULES.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{
1111
"name": "coreclr",
1212
"url": "git://github.com/mono/coreclr.git",
13-
"rev": "d0e6a36f782f5ee1ca0b7d3ec0c55725c3571b1f",
13+
"rev": "83d8279997d8ce4ad344ff9b937b2d13d074dcaa",
1414
"remote-branch": "origin/mono",
1515
"branch": "mono",
1616
"directory": "coreclr"

acceptance-tests/coreclr.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ coreclr-runtest-coremanglib: coreclr-validate test-runner.exe $(CORECLR_COREMANG
3232
check-coreclr: coreclr-compile-tests coreclr-runtest-basic coreclr-runtest-coremanglib
3333

3434
coreclr-gcstress: coreclr-validate GCStressTests.exe $(CORECLR_STRESSTESTSI_CS)
35-
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/testmix_gc.config; if [ $$? -ne 100 ]; then exit 1; fi
35+
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/$(if $(CI_PR),testmix_gc_pr.config,testmix_gc.config); if [ $$? -ne 100 ]; then exit 1; fi
3636

3737
# Output a variable in $(2) to the file $(1), separated by newline characters
3838
# we need to do it in groups of 100 entries to make sure we don't exceed shell char limits
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash -e
22

3+
# run the MS test suite
34
LANG=en_US.UTF-8 ${TESTCMD} --label=check-ms-test-suite --timeout=10m make -C acceptance-tests check-ms-test-suite
45

56
total_tests=$(find acceptance-tests/ -name TestResult*xml | xargs cat | grep -c "<test-case")
@@ -8,9 +9,13 @@ if [ "$total_tests" -lt "1600" ]
89
exit 1
910
fi
1011

12+
# run Roslyn tests
1113
${TESTCMD} --label=check-roslyn --timeout=60m make -C acceptance-tests check-roslyn
1214

13-
#${TESTCMD} --label=coreclr-compile-tests --timeout=80m --fatal make -C acceptance-tests coreclr-compile-tests
14-
${TESTCMD} --label=coreclr-runtest-basic --timeout=45m make -C acceptance-tests coreclr-runtest-basic
15-
${TESTCMD} --label=coreclr-runtest-coremanglib --timeout=90m make -C acceptance-tests coreclr-runtest-coremanglib
16-
#${TESTCMD} --label=coreclr-gcstress --timeout=1200m make -C acceptance-tests coreclr-gcstress
15+
# run CoreCLR managed tests, we precompile them in parallel so individual steps don't need to do it
16+
${TESTCMD} --label=coreclr-compile-tests --timeout=80m --fatal make -C acceptance-tests coreclr-compile-tests
17+
${TESTCMD} --label=coreclr-runtest-basic --timeout=10m make -C acceptance-tests coreclr-runtest-basic
18+
${TESTCMD} --label=coreclr-runtest-coremanglib --timeout=10m make -C acceptance-tests coreclr-runtest-coremanglib
19+
20+
# run the GC stress tests (on PRs we only run a short version)
21+
${TESTCMD} --label=coreclr-gcstress --timeout=1200m make -C acceptance-tests coreclr-gcstress CI_PR=${ghprbPullId}

0 commit comments

Comments
 (0)