From 922d4e215061855e930f21588b2a65378820734c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 2 Nov 2015 16:39:49 +0100 Subject: [PATCH] [acceptance-tests] Remove some tests that were removed upstream Also bump coreclr to pick up latest commit. --- acceptance-tests/Makefile.am | 11 +---------- acceptance-tests/SUBMODULES.json | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index fdc01730941..762f546c054 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -1180,10 +1180,6 @@ CORECLR_TEST_CS_SRC= \ $(CORECLR_PATH)/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.cs \ $(CORECLR_PATH)/tests/src/Loader/regressions/classloader/main.cs \ $(CORECLR_PATH)/tests/src/Loader/regressions/classloader/vsw307137.cs \ - $(CORECLR_PATH)/tests/src/Loader/regressions/classloader-generics/repro237932.cs \ - $(CORECLR_PATH)/tests/src/Loader/regressions/classloader-generics/StaticsProblem5.cs \ - $(CORECLR_PATH)/tests/src/Loader/regressions/classloader-generics/vsw514968.cs \ - $(CORECLR_PATH)/tests/src/Loader/typeinitialization/circularcctorthreethreads03.cs \ $(CORECLR_PATH)/tests/src/managed/Compilation/HelloWorld.cs \ $(CORECLR_PATH)/tests/src/Regressions/common/ArrayCopy.cs \ $(CORECLR_PATH)/tests/src/Regressions/common/avtest.cs \ @@ -3776,16 +3772,12 @@ CORECLR_TESTLIBRARY_CS_SRC = \ $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/Utilities.cs \ $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/CalendarHelpers.cs \ $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/Generator.cs \ - $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/Env.cs \ $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/EndianessChecker.cs \ $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/GlobLocHelper.cs \ $(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/Logging.cs -# the ICastable interface isn't implemented in Mono yet: -CORECLR_DISABLED_TEST_CS_SRC = $(CORECLR_PATH)/tests/src/Interop/ICastable/Castable.cs - # needs parameters: -CORECLR_DISABLED_TEST_CS_SRC += $(CORECLR_PATH)/tests/src/Loader/regressions/polyrec/polyrec.cs +CORECLR_DISABLED_TEST_CS_SRC = $(CORECLR_PATH)/tests/src/Loader/regressions/polyrec/polyrec.cs # relies on env vars: CORECLR_DISABLED_TEST_CS_SRC += \ @@ -3801,7 +3793,6 @@ CORECLR_DISABLED_TEST_CS_SRC += \ CORECLR_DISABLED_TEST_CS_SRC += \ $(CORECLR_PATH)/tests/src/Regressions/assemblyref/assem.cs \ $(CORECLR_PATH)/tests/src/Regressions/assemblyref/test.cs \ - $(CORECLR_PATH)/tests/src/Interop/NativeCallable/NativeCallableTest.cs \ $(CORECLR_PATH)/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.cs # relies on a define: diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index 0c29906292f..dd9f284dc6f 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": "3b2969dffe191b03f1ac85a9c1e62417c9b7833b", + "rev": "d17e1e45e9b9e14a56ebecec21155257ab9f73f7", "remote-branch": "origin/mono", "branch": "mono", "directory": "coreclr" -- 2.25.1