diff options
| -rw-r--r-- | test/testevt.c | 6 | ||||
| -rw-r--r-- | test/testmtx.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/testevt.c b/test/testevt.c index 1ac8b76c8..db486601e 100644 --- a/test/testevt.c +++ b/test/testevt.c @@ -207,7 +207,6 @@ static void evt3_execute(void) { test_assert(5, m == 0, "spurious event");
m = chEvtWaitAllTimeout(ALL_EVENTS, 10);
test_assert(6, m == 0, "spurious event");
-#endif
}
const struct testcase testevt3 = {
@@ -216,8 +215,7 @@ const struct testcase testevt3 = { NULL,
evt3_execute
};
-
-#endif /* CH_USE_EVENTS */
+#endif /* CH_USE_EVENTS_TIMEOUT */
/*
* Test sequence for events pattern.
@@ -232,3 +230,5 @@ const struct testcase * const patternevt[] = { #endif
NULL
};
+
+#endif /* CH_USE_EVENTS */
diff --git a/test/testmtx.c b/test/testmtx.c index f3023b87d..ddc32e7d5 100644 --- a/test/testmtx.c +++ b/test/testmtx.c @@ -428,7 +428,11 @@ static msg_t thread11(void *p) { chMtxLock(&m2);
chMtxLock(&m1);
+#if CH_USE_CONDVARS_TIMEOUT
chCondWaitTimeout(&c1, TIME_INFINITE);
+#else
+ chCondWait(&c1);
+#endif
test_emit_token(*(char *)p);
chMtxUnlock();
chMtxUnlock();
|