Imported Upstream version 6.0.0.255
Former-commit-id: a809b61efe270682042e308f31b142c7df27f1ca
This commit is contained in:
parent
08f368abd7
commit
03112dc19c
@ -1 +1 @@
|
||||
b7a19436bc6ba92737945e204fbddc95ba281d6e
|
||||
74abfccb776ba324a0275fcc0ddb2897bdf001d5
|
@ -1 +1 @@
|
||||
2fb685bad934e0f5daf1a4afa62c5447831979d1
|
||||
445ee57c4662662a46c91f4416ed9da910fad8c3
|
@ -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.250";
|
||||
public const string MonoVersion = "6.0.0.255";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -329,7 +329,7 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
|
||||
endif
|
||||
|
||||
check: run-xunit-test-local
|
||||
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll
|
||||
xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
run-xunit-test-local: run-xunit-test-lib
|
||||
|
||||
$(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
|
||||
@ -338,14 +338,15 @@ $(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir)
|
||||
$(test_lib_dir)/Xunit.NetCore.Extensions.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll | $(test_lib_dir)
|
||||
@cp -f $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll $@
|
||||
|
||||
$(test_lib_dir)/xunit.execution.dotnet.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll | $(test_lib_dir)
|
||||
@cp -f $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll $@
|
||||
|
||||
# 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
|
||||
ok=:; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR="$(XTEST_REMOTE_EXECUTOR_ABSPATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xtest_lib_output) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
|
||||
if [ -n "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE" ]; then echo "$(abspath $(XTEST_RESULT_FILE))" >> "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE"; fi; \
|
||||
$$ok
|
||||
@rm -f $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
|
||||
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
|
||||
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir)
|
||||
|
@ -1 +1 @@
|
||||
bba1f46f4aa1a182adb7fae0ad835d43103205be
|
||||
1645b18a9d8dda6529e3cdae726e1c21a2227ba7
|
@ -1 +1 @@
|
||||
9c57ec0f725aa176ef4cf96f981fad5a05dea602
|
||||
7a576bb41bd21859526feae7b08e48e9b31fa50c
|
@ -1 +1 @@
|
||||
e3114509056352eca32bb98052f87ff63ed78cfc
|
||||
be39720ce0c5b32ef632aa70f2e4559d7c10b573
|
Binary file not shown.
@ -1 +1 @@
|
||||
7609b7638cf30c5dc14ac3a4d3219393d5660cd9
|
||||
5594789749490508283bf82b09672da5f4310d25
|
@ -1 +1 @@
|
||||
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e
|
||||
3793ea7f306407ceac890e0dc1f0048946374e59
|
@ -1 +1 @@
|
||||
ab7ea80519c4dbad0c6366395afdd14302f6eb3b
|
||||
5dcca253494d6da57816a6e9c9702b3a3a4723e4
|
@ -1 +1 @@
|
||||
c46338c204644399b8e25c5f868445c74c51965c
|
||||
042d381ea6d1a6bc1d3ca453f46804a982a2bdbf
|
@ -1 +1 @@
|
||||
bba1f46f4aa1a182adb7fae0ad835d43103205be
|
||||
1645b18a9d8dda6529e3cdae726e1c21a2227ba7
|
@ -1 +1 @@
|
||||
9c57ec0f725aa176ef4cf96f981fad5a05dea602
|
||||
7a576bb41bd21859526feae7b08e48e9b31fa50c
|
@ -1 +1 @@
|
||||
e3114509056352eca32bb98052f87ff63ed78cfc
|
||||
be39720ce0c5b32ef632aa70f2e4559d7c10b573
|
Binary file not shown.
@ -1 +1 @@
|
||||
7609b7638cf30c5dc14ac3a4d3219393d5660cd9
|
||||
5594789749490508283bf82b09672da5f4310d25
|
@ -1 +1 @@
|
||||
d4608bcc96e9e2117d3f4ecc19bb20af4826f17e
|
||||
3793ea7f306407ceac890e0dc1f0048946374e59
|
@ -1 +1 @@
|
||||
ab7ea80519c4dbad0c6366395afdd14302f6eb3b
|
||||
5dcca253494d6da57816a6e9c9702b3a3a4723e4
|
@ -1 +1 @@
|
||||
c46338c204644399b8e25c5f868445c74c51965c
|
||||
042d381ea6d1a6bc1d3ca453f46804a982a2bdbf
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user