Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove framework load, disable mac timeout test (#1676)

Browse Source 
* Remove system includes from all mac builds

* Disable java watchdog on mac
This commit is contained in:
Thad House
2019-05-05 13:16:47 -07:00
committed by Peter Johnson
parent 1c454b000f
commit 698edfda9d
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
View File

@@ -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);