Merge pull request #2371 from spouliot/xcode9-b4-ignore-watchos-tests…

…-58348 [tests] Disable watchOS from harness only. Workaround #58348
xamarin · Jul 25, 2017 · 7051db8 · 7051db8
2 parents 638de61 + 8dffb06
commit 7051db8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
 

diff --git 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"];