From d16413148e1270cd55481cfb521aad02bc688e91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 30 Jul 2014 18:55:06 +0200 Subject: [PATCH] Don't run net_4_0 tests during "make check" As @marek-safar noted in mono@cf4f10e#commitcomment-7128403, the IL code for the 4.0 profile is never used for running (the assemblies are just built for having metadata), so it makes no sense to execute 4.0 tests during "make check" --- mcs/build/profiles/net_4_0.make | 3 +++ mcs/class/corlib/Makefile | 2 ++ 2 files changed, 5 insertions(+) diff --git a/mcs/build/profiles/net_4_0.make b/mcs/build/profiles/net_4_0.make index a5bec4cd2cc..99782bd526a 100644 --- a/mcs/build/profiles/net_4_0.make +++ b/mcs/build/profiles/net_4_0.make @@ -17,3 +17,6 @@ FRAMEWORK_VERSION = 4.0 XBUILD_VERSION = 4.0 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) + +# Ignore tests on net_4_0 as the 4.0 IL code is never used for running (just for metadata), so it doesn't make sense to execute tests there +NO_TEST = yes diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index f3126697a04..b9a11912d07 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -147,8 +147,10 @@ run-test-vts: test-vts @echo Running vts tests... PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \ $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe +ifndef NO_TEST test: test-vts run-test: run-test-vts +endif EXTRA_DISTFILES += \ $(vtsdir)/VersionTolerantSerializationTestLib/1.0/Address.cs \ -- 2.11.4.GIT