1 files changed, 17 insertions, 9 deletions
diff --git a/test/testsem.c b/test/testsem.c
index c16bb0e68..c582d9531 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -37,9 +37,6 @@ static void sem1_setup(void) {
   chSemInit(&sem1, 0);
 }
 
-static void sem1_teardown(void) {
-}
-
 static msg_t thread(void *p) {
 
   chSemWait(&sem1);
@@ -66,10 +63,11 @@ static void sem1_execute(void) {
 const struct testcase testsem1 = {
   sem1_gettest,
   sem1_setup,
-  sem1_teardown,
+  NULL,
   sem1_execute
 };
 
+#if CH_USE_SEMAPHORES_TIMEOUT
 static char *sem2_gettest(void) {
 
   return "Semaphores, timeout test";
@@ -80,9 +78,6 @@ static void sem2_setup(void) {
   chSemInit(&sem1, 0);
 }
 
-static void sem2_teardown(void) {
-}
-
 static void sem2_execute(void) {
   int i;
   systime_t target_time;
@@ -101,8 +96,21 @@ static void sem2_execute(void) {
 const struct testcase testsem2 = {
   sem2_gettest,
   sem2_setup,
-  sem2_teardown,
+  NULL,
   sem2_execute
 };
-
+#endif /* CH_USE_SEMAPHORES_TIMEOUT */
 #endif /* CH_USE_SEMAPHORES */
+
+/*
+ * Test sequence for semaphores pattern.
+ */
+const struct testcase *patternsem[] = {
+#if CH_USE_SEMAPHORES
+  &testsem1,
+#if CH_USE_SEMAPHORES_TIMEOUT
+  &testsem2,
+#endif
+#endif
+  NULL
+};