From 698edfda9dd5cfc92f63daa270337fc3d97fa03a Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Sun, 5 May 2019 13:16:47 -0700
Subject: [PATCH] Remove framework load, disable mac timeout test (#1676)

* Remove system includes from all mac builds

* Disable java watchdog on mac
---
 .../src/main/groovy/SingleNativeBuild.groovy     | 16 ++++++++++++++++
 wpilibc/src/test/native/cpp/WatchdogTest.cpp     |  4 ++++
 .../java/edu/wpi/first/wpilibj/WatchdogTest.java |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/buildSrc/src/main/groovy/SingleNativeBuild.groovy b/buildSrc/src/main/groovy/SingleNativeBuild.groovy
index f37fc57719..20d415da07 100644
--- a/buildSrc/src/main/groovy/SingleNativeBuild.groovy
+++ b/buildSrc/src/main/groovy/SingleNativeBuild.groovy
@@ -50,6 +50,22 @@ class SingleNativeBuild implements Plugin<Project> {
 
     @CompileStatic
     static class Rules extends RuleSource {
+        @Mutate
+        @CompileStatic
+        void removeMacSystemIncludes(ModelMap<Task> tasks, BinaryContainer binaries) {
+            binaries.each {
+                if (!(it instanceof NativeBinarySpec)) {
+                    return
+                }
+                NativeBinarySpec nativeBin = (NativeBinarySpec)it
+                if (nativeBin.targetPlatform.operatingSystem.isMacOsX()) {
+                    nativeBin.tasks.withType(AbstractNativeSourceCompileTask) { AbstractNativeSourceCompileTask compileTask->
+                        compileTask.getSystemIncludes().setFrom()
+                    }
+                }
+            }
+        }
+
         @Mutate
         @CompileStatic
         void setupSingleNativeBuild(ModelMap<Task> tasks, ComponentSpecContainer components, BinaryContainer binaryContainer, ProjectLayout projectLayout) {
diff --git a/wpilibc/src/test/native/cpp/WatchdogTest.cpp b/wpilibc/src/test/native/cpp/WatchdogTest.cpp
index c796116975..9659f42534 100644
--- a/wpilibc/src/test/native/cpp/WatchdogTest.cpp
+++ b/wpilibc/src/test/native/cpp/WatchdogTest.cpp
@@ -62,7 +62,11 @@ TEST(WatchdogTest, Reset) {
   EXPECT_EQ(0u, watchdogCounter) << "Watchdog triggered early";
 }
 
+#ifdef __APPLE__
+TEST(WatchdogTest, DISABLED_SetTimeout) {
+#else
 TEST(WatchdogTest, SetTimeout) {
+#endif
   uint32_t watchdogCounter = 0;
 
   Watchdog watchdog(1.0, [&] { watchdogCounter++; });
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
index 09414cfbaa..0a7929448a 100644
--- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
+++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
@@ -10,6 +10,8 @@ package edu.wpi.first.wpilibj;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -187,6 +189,7 @@ class WatchdogTest {
   }
 
   @Test
+  @DisabledOnOs(OS.MAC)
   void multiWatchdogTest() {
     final AtomicInteger watchdogCounter1 = new AtomicInteger(0);
     final AtomicInteger watchdogCounter2 = new AtomicInteger(0);