diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-11-27 23:49:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 23:49:53 +0300 |
| commit | 41a3571272de1f31f4723fd91cb4e293f1d41ab3 (patch) | |
| tree | ca7a1f99f95b542867003ce8f81ca8ca08b13eb9 /acceptance-tests | |
| parent | 198147add46a68fe21297ca856513bd15ebf52c9 (diff) | |
[acceptance-tests] Run shorter version of GCStress on PRs and update targets (#6106)
In 22f0977132c09c17bfc88c6e64b27c9eb1c91c50 it was disabled
but we can actually just run a shorter version in PRs.
Also reenable the precompilation target for the managed CoreCLR tests.
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/SUBMODULES.json | 2 | ||||
| -rw-r--r-- | acceptance-tests/coreclr.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index e205c73f395..2d8ac86e405 100644 --- a/acceptance-tests/SUBMODULES.json +++ b/acceptance-tests/SUBMODULES.json @@ -10,7 +10,7 @@ { "name": "coreclr", "url": "git://github.com/mono/coreclr.git", - "rev": "d0e6a36f782f5ee1ca0b7d3ec0c55725c3571b1f", + "rev": "83d8279997d8ce4ad344ff9b937b2d13d074dcaa", "remote-branch": "origin/mono", "branch": "mono", "directory": "coreclr" diff --git a/acceptance-tests/coreclr.mk b/acceptance-tests/coreclr.mk index 6fc6a282364..4cc234e1abb 100644 --- a/acceptance-tests/coreclr.mk +++ b/acceptance-tests/coreclr.mk @@ -32,7 +32,7 @@ coreclr-runtest-coremanglib: coreclr-validate test-runner.exe $(CORECLR_COREMANG check-coreclr: coreclr-compile-tests coreclr-runtest-basic coreclr-runtest-coremanglib coreclr-gcstress: coreclr-validate GCStressTests.exe $(CORECLR_STRESSTESTSI_CS) - 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 + 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 # Output a variable in $(2) to the file $(1), separated by newline characters # we need to do it in groups of 100 entries to make sure we don't exceed shell char limits |