mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.0.0.212

Browse Source 
Former-commit-id: 6799385be92e727475f2ebc65c4ef6e623ed0ae0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-05-07 08:52:05 +00:00
parent 61312eea06
commit bf8c8e164f
50 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/build/common/Consts.cs
View File

@@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.0.0.209";
public const string MonoVersion = "6.0.0.212";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

10
mcs/build/tests.make
View File

@@ -134,7 +134,7 @@ ifdef HAVE_CS_TESTS
test_assemblies += $(test_lib_output)
check: run-test
test-local: $(test_assemblies)
test-local: $(test_assemblies) $(test_lib_dir)/nunit-excludes.txt
run-test-local: run-test-lib
run-test-ondotnet-local: run-test-ondotnet-lib
@@ -233,6 +233,9 @@ else
TEST_HARNESS_EXEC=$(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(TEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(TEST_HARNESS)
endif
$(test_lib_dir)/nunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
@echo "$(TEST_HARNESS_EXCLUDES)" > $@
## FIXME: i18n problem in the 'sed' command below
run-test-lib: test-local test-local-aot-compile copy-nunitlite-appconfig
ok=:; \
@@ -326,9 +329,12 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
endif
check: run-xunit-test-local
xunit-test-local: $(xtest_lib_output)
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt
run-xunit-test-local: run-xunit-test-lib
$(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
@echo "$(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM)" > $@
# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only
run-xunit-test-lib: xunit-test-local
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll