diff options
| -rw-r--r-- | mcs/build/tests.make | 8 | ||||
| -rw-r--r-- | runtime/Makefile.am | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mcs/build/tests.make b/mcs/build/tests.make index f82d9d315cd..f8b0fdd80fa 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -340,7 +340,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) @@ -349,14 +349,14 @@ $(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 $@ -# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only +$(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 $@ + 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) diff --git a/runtime/Makefile.am b/runtime/Makefile.am index f7c8f284a0b..3a84c023237 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -170,7 +170,6 @@ test-bundle-local: cp -L -R $(mcs_topdir)/class/lib/$$profile $(TEST_BUNDLE_PATH); \ done cp -L $(top_srcdir)/external/xunit-binaries/*.dll $(top_srcdir)/external/xunit-binaries/*.exe $(top_srcdir)/external/xunit-binaries/*.config $(TEST_BUNDLE_PATH)/net_4_x/ - cp -L $(top_srcdir)/external/xunit-binaries/xunit.execution.dotnet.dll $(TEST_BUNDLE_PATH)/net_4_x/tests/ $(MAKE) -C $(mcs_topdir)/tests test-bundle $(MAKE) -C $(mcs_topdir)/errors test-bundle $(MAKE) -C $(mcs_topdir)/packages test-bundle |