diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-12-18 23:11:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-18 23:11:17 +0300 |
| commit | 3891fe97d22995d386db0e95983d062f29a85f1d (patch) | |
| tree | 04d90548bbafc4c8c96a30f0aac19f474948e216 /mcs/class/System.Net.Http | |
| parent | 2ff93e4c7665327535d14ffe9ce1173c4571253b (diff) | |
[bcl] Split corlib and System.Core xunit test assemblies for monotouch profiles (#18228)
They cannot deal with large test assemblies so we need to split them.
We're doing this by introducing a new `#skip <PROFILE>` directive in the .sources format which defines where to split the assembly.
The logic is very simple: files up until the first `#skip` are common files which get included in each part, subsequent files are only in the respective part assembly.
Fixes https://github.com/mono/mono/issues/18213
Diffstat (limited to 'mcs/class/System.Net.Http')
4 files changed, 9 insertions, 10 deletions
diff --git a/mcs/class/System.Net.Http/FunctionalTests/Makefile b/mcs/class/System.Net.Http/FunctionalTests/Makefile index 8e8991fbdb0..6e820c1b20c 100644 --- a/mcs/class/System.Net.Http/FunctionalTests/Makefile +++ b/mcs/class/System.Net.Http/FunctionalTests/Makefile @@ -2,16 +2,15 @@ thisdir = class/System.Net.Http/FunctionalTests SUBDIRS = include ../../../build/rules.make -ASSEMBLY = System.Net.Http.FunctionalTests +LIBRARY = System.Net.Http.FunctionalTests.dll +NO_BUILD = yes +NO_INSTALL = yes -XTEST_LIB_REFS = System System.Core Facades/System.Threading.Tasks +XTEST_LIB_REFS = System System.Core Facades/System.Threading.Tasks System.Net.Http USE_XTEST_REMOTE_EXECUTOR = YES XTEST_LIB_FLAGS = /resource:../../System/Test/TestData/testservereku.contoso.com.pfx - -the_assembly = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/System.Net.Http.dll - -include ../../../build/tests.make +include ../../../build/library.make TEST_RUNTIME := MONO_URI_DOTNETRELATIVEORABSOLUTE=true $(TEST_RUNTIME) diff --git a/mcs/class/System.Net.Http/FunctionalTests/System.Net.Http.FunctionalTests.dll.sources b/mcs/class/System.Net.Http/FunctionalTests/System.Net.Http.FunctionalTests.dll.sources new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/mcs/class/System.Net.Http/FunctionalTests/System.Net.Http.FunctionalTests.dll.sources diff --git a/mcs/class/System.Net.Http/UnitTests/Makefile b/mcs/class/System.Net.Http/UnitTests/Makefile index bfce3ec2edf..fe1cde9f66c 100644 --- a/mcs/class/System.Net.Http/UnitTests/Makefile +++ b/mcs/class/System.Net.Http/UnitTests/Makefile @@ -2,15 +2,15 @@ thisdir = class/System.Net.Http/UnitTests SUBDIRS = include ../../../build/rules.make -ASSEMBLY = System.Net.Http.UnitTests +LIBRARY = System.Net.Http.UnitTests.dll +NO_BUILD = yes +NO_INSTALL = yes XTEST_LIB_REFS = System System.Core Facades/System.Threading.Tasks USE_XTEST_REMOTE_EXECUTOR = YES XTEST_MCS_FLAGS = -nowarn:436 -include ../../../build/tests.make - -xtest_flags = $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS) /unsafe +include ../../../build/library.make clean-local: -rm -f $(tests_CLEAN_FILES) $(CLEAN_FILES) diff --git a/mcs/class/System.Net.Http/UnitTests/System.Net.Http.UnitTests.dll.sources b/mcs/class/System.Net.Http/UnitTests/System.Net.Http.UnitTests.dll.sources new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/mcs/class/System.Net.Http/UnitTests/System.Net.Http.UnitTests.dll.sources |