From 8e82d2fe100212b76e06ef74fe669a04ef41b401 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 5 Apr 2019 11:54:59 +0200 Subject: [PATCH] Keep the xunit parallelization setting at default value to allow 'Xunit.CollectionBehavior(DisableTestParallelization = true)' override Commit migrated from https://github.com/mono/mono/commit/b60ca5fb6b3e92b787e13df35824e9eb0e65cd81 --- src/mono/netcore/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/netcore/Makefile.am b/src/mono/netcore/Makefile.am index a9ff1d0..ed0eff0 100644 --- a/src/mono/netcore/Makefile.am +++ b/src/mono/netcore/Makefile.am @@ -68,7 +68,7 @@ xtest-%: prepare check-env dl-test-assets cd assets/extracted/$* && \ COMPlus_DebugWriteToStdErr=1 $(CURDIR)/./dotnet --fx-version "$(NETCOREAPP_VERSION)" xunit.console.dll $*.dll \ -notrait category=outerloop -notrait category=nonosxtests -notrait category=failing \ - -notrait category=nonnetcoreapptests -noappdomain -noshadow -parallel all \ + -notrait category=nonnetcoreapptests -noappdomain -noshadow \ -html ../../../TestResult-$*.html -nunit ../../TestResult-$*-netcore-xunit.xml \ $(shell if [ -a $(CURDIR)/excludes-$*.rsp ]; then grep -v '^#\|^$$' $(CURDIR)/excludes-$*.rsp; fi;) \ $(FIXTURE) || true -- 2.7.4