From e0868f0681adcfcecd3208c3c03346d65630728f Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 25 Jul 2017 11:54:33 -0400 Subject: [PATCH 1/2] Revert "Disable watchOS to check if this hides others issues" This reverts commit fed2249fa43290a1956ab2fe0d48f83ab6db9711. --- Make.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.config b/Make.config index 2155f3addb40..1e3a30d5c2b0 100644 --- a/Make.config +++ b/Make.config @@ -84,7 +84,7 @@ MIN_TVOS_SDK_VERSION=9.0 INCLUDE_IOS=1 INCLUDE_MAC=1 -#INCLUDE_WATCH=1 +INCLUDE_WATCH=1 INCLUDE_TVOS=1 INCLUDE_DEVICE=1 From 8dffb06abcb3d9f42be4b7c4f4b741fa3aa2df3f Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 25 Jul 2017 11:56:48 -0400 Subject: [PATCH 2/2] [tests] Disable watchOS from harness only. Workaround #58348 https://bugzilla.xamarin.com/show_bug.cgi?id=58348 --- tests/xharness/Harness.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs index 8b596db74120..e1ba90fcb1bc 100644 --- a/tests/xharness/Harness.cs +++ b/tests/xharness/Harness.cs @@ -280,7 +280,7 @@ void LoadConfig () INCLUDE_IOS = make_config.ContainsKey ("INCLUDE_IOS") && !string.IsNullOrEmpty (make_config ["INCLUDE_IOS"]); INCLUDE_TVOS = make_config.ContainsKey ("INCLUDE_TVOS") && !string.IsNullOrEmpty (make_config ["INCLUDE_TVOS"]); JENKINS_RESULTS_DIRECTORY = make_config ["JENKINS_RESULTS_DIRECTORY"]; - INCLUDE_WATCH = make_config.ContainsKey ("INCLUDE_WATCH") && !string.IsNullOrEmpty (make_config ["INCLUDE_WATCH"]); + INCLUDE_WATCH = false; INCLUDE_MAC = make_config.ContainsKey ("INCLUDE_MAC") && !string.IsNullOrEmpty (make_config ["INCLUDE_MAC"]); MAC_DESTDIR = make_config ["MAC_DESTDIR"]; IOS_DESTDIR = make_config ["IOS_DESTDIR"];