Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2016-03-12 03:03:14 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2016-03-12 03:12:12 +0300
commit56272d7ec1c15dff6f00adf6db9883be37e9186a (patch)
tree8c38091ed5d66404f1558716238b2f7882061a39 /acceptance-tests/coreclr.mk
parentd6c0ebf313b036aeac5c02fbe059770b06285262 (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/coreclr.mk')
-rw-r--r--acceptance-tests/coreclr.mk4
1 files changed, 3 insertions, 1 deletions
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 \