1 files changed, 16 insertions, 8 deletions
diff --git a/test/testmsg.c b/test/testmsg.c
index 735375a16..8af1c29e3 100644
--- a/test/testmsg.c
+++ b/test/testmsg.c
@@ -21,17 +21,13 @@
 
 #include "test.h"
 
+#if CH_USE_MESSAGES
+
 static char *msg1_gettest(void) {
 
   return "Messages, dispatch test";
 }
 
-static void msg1_setup(void) {
-}
-
-static void msg1_teardown(void) {
-}
-
 static msg_t thread(void *p) {
   msg_t msg;
   int i;
@@ -59,7 +55,19 @@ static void msg1_execute(void) {
 
 const struct testcase testmsg1 = {
   msg1_gettest,
-  msg1_setup,
-  msg1_teardown,
+  NULL,
+  NULL,
   msg1_execute
 };
+
+#endif /* CH_USE_MESSAGES */
+
+/*
+ * Test sequence for messages pattern.
+ */
+const struct testcase *patternmsg[] = {
+#if CH_USE_MESSAGES
+  &testmsg1,
+#endif
+  NULL
+};