diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-03-12 03:03:14 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-03-12 03:12:12 +0300 |
| commit | 56272d7ec1c15dff6f00adf6db9883be37e9186a (patch) | |
| tree | 8c38091ed5d66404f1558716238b2f7882061a39 /acceptance-tests | |
| parent | d6c0ebf313b036aeac5c02fbe059770b06285262 (diff) | |
[acceptance-tests] Bump coreclr and ms-test-suite to bring in some fixes
Also disable a test that makes no sense.
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/SUBMODULES.json | 4 | ||||
| -rw-r--r-- | acceptance-tests/coreclr.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index e0335f40f7d..534d2729fd3 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": "96cf61f96b42cf9d013e641609cb7787f6e3a71f", + "rev": "d964b6b194e508921b75194b216c315116e33fef", "remote-branch": "origin/mono", "branch": "mono", "directory": "coreclr" @@ -18,7 +18,7 @@ { "name": "ms-test-suite", "url": "git@github.com:xamarin/ms-test-suite.git", - "rev": "8eb26bd72a38e2c78675db45b13e89237dbdf4f2", + "rev": "1ab0d4972937bf0451fc164f39a67475776a9edf", "remote-branch": "origin/master", "branch": "master", "directory": "ms-test-suite" diff --git a/acceptance-tests/coreclr.mk b/acceptance-tests/coreclr.mk index dd141bcb194..2271e371f69 100644 --- a/acceptance-tests/coreclr.mk +++ b/acceptance-tests/coreclr.mk @@ -1186,7 +1186,6 @@ CORECLR_TEST_CS_SRC= \ $(CORECLR_PATH)/tests/src/Regressions/coreclr/0576/test0576.cs \ $(CORECLR_PATH)/tests/src/Regressions/coreclr/0582/csgen.1.cs \ $(CORECLR_PATH)/tests/src/Regressions/coreclr/0583/test583.cs \ - $(CORECLR_PATH)/tests/src/Regressions/coreclr/0584/test584.cs \ $(CORECLR_PATH)/tests/src/Regressions/coreclr/0792/test0792.cs \ $(CORECLR_PATH)/tests/src/Regressions/coreclr/0828/test0828.cs \ $(CORECLR_PATH)/tests/src/Regressions/coreclr/0829/test0829.cs \ @@ -4001,6 +4000,9 @@ CORECLR_DISABLED_TEST_CS_SRC += \ $(CORECLR_PATH)/tests/src/hosting/samples/hosting/usercode/usercode.cs \ $(CORECLR_PATH)/tests/src/hosting/samples/resolveevent/usercodedependency/usercodedependency.cs +# this test makes no sense, the expected pattern is the English one for all cultures +CORECLR_DISABLED_TEST_CS_SRC += $(CORECLR_PATH)/tests/src/Regressions/coreclr/0584/test584.cs + CORECLR_TEST_IL_SRC = \ $(CORECLR_PATH)/tests/src/JIT/BBT/Scenario4/Not-Int32.il \ $(CORECLR_PATH)/tests/src/JIT/Directed/Convert/implicitConv.il \ |