Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41: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

4
wpilibc/src/test/native/cpp/WatchdogTest.cpp
View File

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