[bcl] Build all XUnit and NUnit tests for monodroid, monotouch, monotouch_tv, monotouch_watch and wasm BCL profiles (mono#11201)

luhenry · web-flow · commit a282040c96f4 · 2018-10-17T14:44:45.000-04:00
diff --git a/external/nunit-lite b/external/nunit-lite
@@ -1 +1 @@
-Subproject commit e64e0197a825e51364dacd0b37239a5de60733b6
+Subproject commit cff33213224e30289f20ee28d2507535271ee981
diff --git a/mcs/build/profiles/monotouch_tv.make b/mcs/build/profiles/monotouch_tv.make
@@ -7,3 +7,4 @@ NO_THREAD_ABORT=1
 NO_THREAD_SUSPEND_RESUME=1
 NO_MULTIPLE_APPDOMAINS=1
 NO_PROCESS_START=1
+NO_VTS_TEST=1
diff --git a/mcs/build/profiles/monotouch_watch.make b/mcs/build/profiles/monotouch_watch.make
@@ -12,3 +12,4 @@ NO_MONO_SECURITY=1
 MONO_FEATURE_APPLETLS=
 ONLY_APPLETLS=
 MONO_FEATURE_APPLE_X509=1
+NO_VTS_TEST=1
diff --git a/mcs/build/tests.make b/mcs/build/tests.make
@@ -44,8 +44,15 @@ $(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs
 ifeq ($(PROFILE),monodroid)
 xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
 else
-xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs \
-$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
+ifeq ($(PROFILE),monotouch_tv)
+xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
+else
+ifeq ($(PROFILE),monotouch_watch)
+xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
+else
+xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
+endif
+endif
 endif
 endif
 
diff --git a/mcs/class/Microsoft.CSharp/monotouch_tv_Microsoft.CSharp_xtest.dll.exclude.sources b/mcs/class/Microsoft.CSharp/monotouch_tv_Microsoft.CSharp_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources
diff --git a/mcs/class/Microsoft.CSharp/monotouch_watch_Microsoft.CSharp_xtest.dll.exclude.sources b/mcs/class/Microsoft.CSharp/monotouch_watch_Microsoft.CSharp_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources
diff --git a/mcs/class/Mono.Data.Sqlite/monotouch_Mono.Data.Sqlite_test.dll.exclude.sources b/mcs/class/Mono.Data.Sqlite/monotouch_Mono.Data.Sqlite_test.dll.exclude.sources
@@ -1 +1,3 @@
 Bug27864.cs
+SqliteDataReaderTest.cs
+SqliteTests.cs
diff --git a/mcs/class/Mono.Data.Sqlite/monotouch_tv_Mono.Data.Sqlite_test.dll.exclude.sources b/mcs/class/Mono.Data.Sqlite/monotouch_tv_Mono.Data.Sqlite_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_Mono.Data.Sqlite_test.dll.exclude.sources
diff --git a/mcs/class/Mono.Data.Sqlite/monotouch_watch_Mono.Data.Sqlite_test.dll.exclude.sources b/mcs/class/Mono.Data.Sqlite/monotouch_watch_Mono.Data.Sqlite_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_Mono.Data.Sqlite_test.dll.exclude.sources
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/monotouch_tv_System.ComponentModel.Composition_xtest.dll.exclude.sources b/mcs/class/System.ComponentModel.Composition.4.5/monotouch_tv_System.ComponentModel.Composition_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/monotouch_watch_System.ComponentModel.Composition_xtest.dll.exclude.sources b/mcs/class/System.ComponentModel.Composition.4.5/monotouch_watch_System.ComponentModel.Composition_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources
diff --git a/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs b/mcs/class/System.Core/Test/System.IO.MemoryMappedFiles/MemoryMappedFileTest.cs
@@ -393,7 +393,7 @@ public void CreateViewStreamWithOffsetPastFileEnd2 ()
 		[Test]
 		public void CreateViewStreamAlignToPageSize ()
 		{
-#if __WATCHOS__
+#if MONOTOUCH_WATCH
 			int pageSize = 4096;
 #elif MONOTOUCH
 			// iOS bugs on ARM64 - bnc #27667 - apple #
diff --git a/mcs/class/System.Core/monotouch_tv_System.Core_xtest.dll.exclude.sources b/mcs/class/System.Core/monotouch_tv_System.Core_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Core_xtest.dll.exclude.sources
diff --git a/mcs/class/System.Core/monotouch_watch_System.Core_xtest.dll.exclude.sources b/mcs/class/System.Core/monotouch_watch_System.Core_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Core_xtest.dll.exclude.sources
diff --git a/mcs/class/System.Drawing/wasm_System.Drawing_test.dll.exclude.sources b/mcs/class/System.Drawing/wasm_System.Drawing_test.dll.exclude.sources
@@ -5,3 +5,4 @@ System.Drawing/TestIcon.cs
 System.Drawing/TestIconConverter.cs
 System.Drawing/TestImage.cs
 System.Drawing/TestImageConverter.cs
+System.Drawing/TestBitmap.cs
diff --git a/mcs/class/System.Runtime.Serialization/Makefile b/mcs/class/System.Runtime.Serialization/Makefile
@@ -17,9 +17,13 @@ XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Th
 
 ifneq ($(PROFILE),monodroid)
 ifneq ($(PROFILE),monotouch)
+ifneq ($(PROFILE),monotouch_tv)
+ifneq ($(PROFILE),monotouch_watch)
 XTEST_LIB_REFS += System.Drawing
 endif
 endif
+endif
+endif
 
 ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_REFS += System.Data System.Configuration SMDiagnostics
diff --git a/mcs/class/System.Runtime.Serialization/monotouch_tv_System.Runtime.Serialization_xtest.dll.exclude.sources b/mcs/class/System.Runtime.Serialization/monotouch_tv_System.Runtime.Serialization_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources
diff --git a/mcs/class/System.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization_xtest.dll.exclude.sources b/mcs/class/System.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources
diff --git a/mcs/class/System.Security/monotouch_tv_System.Security_test.dll.exclude.sources b/mcs/class/System.Security/monotouch_tv_System.Security_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Security_test.dll.exclude.sources
diff --git a/mcs/class/System.Security/monotouch_watch_System.Security_test.dll.exclude.sources b/mcs/class/System.Security/monotouch_watch_System.Security_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Security_test.dll.exclude.sources
diff --git a/mcs/class/System.Web.Services/monotouch_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/monotouch_System.Web.Services_test.dll.exclude.sources
@@ -5,4 +5,3 @@ System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
 System.Web.Services.Configuration/TypeElementTest.cs
 System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
 System.Web.Services.Configuration/WsiProfilesElementTest.cs
-
diff --git a/mcs/class/System.Web.Services/monotouch_tv_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/monotouch_tv_System.Web.Services_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Web.Services_test.dll.exclude.sources
diff --git a/mcs/class/System.Web.Services/monotouch_watch_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/monotouch_watch_System.Web.Services_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System.Web.Services_test.dll.exclude.sources
diff --git a/mcs/class/System.Web.Services/wasm_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/wasm_System.Web.Services_test.dll.exclude.sources
@@ -5,4 +5,3 @@ System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
 System.Web.Services.Configuration/TypeElementTest.cs
 System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
 System.Web.Services.Configuration/WsiProfilesElementTest.cs
-
diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
@@ -22,9 +22,13 @@ XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Th
 
 ifneq ($(PROFILE),monodroid)
 ifneq ($(PROFILE),monotouch)
+ifneq ($(PROFILE),monotouch_tv)
+ifneq ($(PROFILE),monotouch_watch)
 XTEST_LIB_REFS += System.Drawing
 endif
 endif
+endif
+endif
 
 LIBRARY_WARN_AS_ERROR = yes
 
diff --git a/mcs/class/System/Test/System.Net/HttpListenerBasicIdentityTest.cs b/mcs/class/System/Test/System.Net/HttpListenerBasicIdentityTest.cs
@@ -37,7 +37,7 @@ public class HttpListenerBasicIdentityTest {
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void Basic1 ()
 		{
-#if MONOTOUCH_WATCH || __WATCHOS__
+#if MONOTOUCH_WATCH
 			Assert.Ignore ("HttpListenerBasicIdentity is not supported on watchOS");
 #endif
 			HttpListenerBasicIdentity bi = new HttpListenerBasicIdentity (null, null);
@@ -46,7 +46,7 @@ public void Basic1 ()
 		[Test]
 		public void Basic2 ()
 		{
-#if MONOTOUCH_WATCH || __WATCHOS__
+#if MONOTOUCH_WATCH
 			Assert.Ignore ("HttpListenerBasicIdentity is not supported on watchOS");
 #endif
 			HttpListenerBasicIdentity bi = new HttpListenerBasicIdentity ("", null);
@@ -59,7 +59,7 @@ public void Basic2 ()
 		[Test]
 		public void Basic3 ()
 		{
-#if MONOTOUCH_WATCH || __WATCHOS__
+#if MONOTOUCH_WATCH
 			Assert.Ignore ("HttpListenerBasicIdentity is not supported on watchOS");
 #endif
 			HttpListenerBasicIdentity bi = new HttpListenerBasicIdentity ("hey", null);
@@ -72,7 +72,7 @@ public void Basic3 ()
 		[Test]
 		public void Basic4 ()
 		{
-#if MONOTOUCH_WATCH || __WATCHOS__
+#if MONOTOUCH_WATCH
 			Assert.Ignore ("HttpListenerBasicIdentity is not supported on watchOS");
 #endif
 			HttpListenerBasicIdentity bi = new HttpListenerBasicIdentity ("hey", "pass");
diff --git a/mcs/class/System/monotouch_tv_System_test.dll.exclude.sources b/mcs/class/System/monotouch_tv_System_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_System_test.dll.exclude.sources
diff --git a/mcs/class/System/monotouch_tv_System_xtest.dll.exclude.sources b/mcs/class/System/monotouch_tv_System_xtest.dll.exclude.sources
@@ -0,0 +1,14 @@
+#include monotouch_System_xtest.dll.exclude.sources
+../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
+../../../external/corefx/src/System.CodeDom/tests/*.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/Utility/FileSystemWatcherTest.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs
diff --git a/mcs/class/System/monotouch_watch_System_test.dll.exclude.sources b/mcs/class/System/monotouch_watch_System_test.dll.exclude.sources
@@ -0,0 +1,2 @@
+#include monotouch_System_test.dll.exclude.sources
+System.Net/HttpWebRequestTest.cs
diff --git a/mcs/class/System/monotouch_watch_System_xtest.dll.exclude.sources b/mcs/class/System/monotouch_watch_System_xtest.dll.exclude.sources
@@ -0,0 +1,14 @@
+#include monotouch_System_xtest.dll.exclude.sources
+../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
+../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
+../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
+../../../external/corefx/src/System.CodeDom/tests/*.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/Utility/FileSystemWatcherTest.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs
diff --git a/mcs/class/corlib/Test/System.IO/FileTest.cs b/mcs/class/corlib/Test/System.IO/FileTest.cs
@@ -2774,7 +2774,7 @@ public void MoveTest ()
 		public static extern int symlink (string oldpath, string newpath);
 
 		[Test]
-#if __TVOS__
+#if MONOTOUCH_TV
 		[Ignore ("See bug #59239")]
 #endif
 		public void SymLinkLoop ()
diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -195,7 +195,7 @@ public void GetEntryAssembly ()
 			// note: only available in default appdomain
 			// http://weblogs.asp.net/asanto/archive/2003/09/08/26710.aspx
 			// Not sure we should emulate this behavior.
-#if __WATCHOS__
+#if MONOTOUCH_WATCH
 			Assert.IsNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
 			Assert.IsTrue (AppDomain.CurrentDomain.IsDefaultAppDomain (), "!default appdomain");
 #elif !MONODROID
diff --git a/mcs/class/corlib/Test/System/EnvironmentTest.cs b/mcs/class/corlib/Test/System/EnvironmentTest.cs
@@ -156,7 +156,7 @@ public void GetEnvironmentVariables_NewlySet ()
 		public void GetCommandLineArgs ()
 		{
 			string[] args = Environment.GetCommandLineArgs ();
-#if !__WATCHOS__
+#if !MONOTOUCH_WATCH
 			Assert.IsNotNull (args, "not null");
 			Assert.IsTrue (((args.Length > 0) && (args.Length < 256)), "reasonable");
 			Assert.IsNotNull (args [0], "application");
diff --git a/mcs/class/corlib/monotouch_tv_corlib_test.dll.exclude.sources b/mcs/class/corlib/monotouch_tv_corlib_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_corlib_test.dll.exclude.sources
diff --git a/mcs/class/corlib/monotouch_tv_corlib_xtest.dll.exclude.sources b/mcs/class/corlib/monotouch_tv_corlib_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_corlib_xtest.dll.exclude.sources
diff --git a/mcs/class/corlib/monotouch_watch_corlib_test.dll.exclude.sources b/mcs/class/corlib/monotouch_watch_corlib_test.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_corlib_test.dll.exclude.sources
diff --git a/mcs/class/corlib/monotouch_watch_corlib_xtest.dll.exclude.sources b/mcs/class/corlib/monotouch_watch_corlib_xtest.dll.exclude.sources
@@ -0,0 +1 @@
+#include monotouch_corlib_xtest.dll.exclude.sources
diff --git a/sdks/builds/bcl.mk b/sdks/builds/bcl.mk
@@ -14,7 +14,6 @@ _bcl_CONFIGURE_FLAGS = \
 .PHONY: build-bcl
 build-bcl: .stamp-bcl-configure
 	$(MAKE) -C bcl -C mono
-	$(MAKE) -C bcl -C runtime all-mcs build_profiles="build"
 
 .PHONY: clean-bcl
 clean-bcl:
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk
@@ -341,11 +341,5 @@ $(eval $(call iOSCrossTemplate,crosswatch,i386,armv7k-unknown,ios-targetwatch,ll
 # 64->arm32 cross compiler
 $(eval $(call iOSCrossTemplate,cross32-64,x86_64,arm,ios-target32,llvm-llvm64,arm-apple-darwin10))
 
-$(eval $(call BclTemplate,ios-bcl,monotouch monotouch_tv monotouch_runtime monotouch_tv_runtime,monotouch))
+$(eval $(call BclTemplate,ios-bcl,monotouch monotouch_runtime monotouch_tv monotouch_tv_runtime monotouch_watch monotouch_watch_runtime,monotouch monotouch_tv monotouch_watch))
 ios_TARGETS += ios-bcl
-
-$(eval $(call BclTemplate,ios-watchbcl,monotouch_watch monotouch_watch_runtime,))
-ios_TARGETS += ios-watchbcl
-
-# Both BCL builds can't be run concurrently
-build-ios-watchbcl: build-ios-bcl
diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk
@@ -95,9 +95,7 @@ _wasm-$(1)_CONFIGURE_FLAGS= \
 
 $$(eval $$(call CrossRuntimeTemplate,wasm-$(1),$$(if $$(filter $$(UNAME),Darwin),$(2)-apple-darwin10,$$(if $$(filter $$(UNAME),Linux),$(2)-linux-gnu,$$(error "Unknown UNAME='$$(UNAME)'"))),$(3)-unknown-none,$(4),$(5),$(6)))
 
-ifdef ENABLE_WASM_CROSS
 wasm_TARGETS += wasm-$(1)-$$(CONFIGURATION) $(5)
-endif
 
 endef
 
@@ -159,9 +157,7 @@ _wasm-$(1)_CONFIGURE_FLAGS= \
 
 $$(eval $$(call CrossRuntimeTemplate,wasm-$(1),$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static),$(3)-unknown-none,$(4),$(5),$(6)))
 
-ifdef ENABLE_WASM_CROSS
 wasm_TARGETS += wasm-$(1)-$$(CONFIGURATION) $(5)
-endif
 
 endef
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`Bug27864.cs`
	`2`	`+SqliteDataReaderTest.cs`
	`3`	`+SqliteTests.cs`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#include monotouch_Mono.Data.Sqlite_test.dll.exclude.sources`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#include monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources`