1 files changed, 8 insertions, 41 deletions
diff --git a/test/testmtx.c b/test/testmtx.c
index f1d7b6d2a..7337b1f14 100644
--- a/test/testmtx.c
+++ b/test/testmtx.c
@@ -83,10 +83,6 @@ static CONDVAR_DECL(c1);
  * The test expects the threads to perform their operations in increasing
  * priority order regardless of the initial order.
  */
-static char *mtx1_gettest(void) {
-
-  return "Mutexes, priority enqueuing test";
-}
 
 static void mtx1_setup(void) {
 
@@ -117,7 +113,7 @@ static void mtx1_execute(void) {
 }
 
 const struct testcase testmtx1 = {
-  mtx1_gettest,
+  "Mutexes, priority enqueuing test",
   mtx1_setup,
   NULL,
   mtx1_execute
@@ -155,11 +151,6 @@ const struct testcase testmtx1 = {
  * @endcode
  */
 
-static char *mtx2_gettest(void) {
-
-  return "Mutexes, priority inheritance, simple case";
-}
-
 static void mtx2_setup(void) {
 
   chMtxInit(&m1);
@@ -213,7 +204,7 @@ static void mtx2_execute(void) {
 }
 
 const struct testcase testmtx2 = {
-  mtx2_gettest,
+  "Mutexes, priority inheritance, simple case",
   mtx2_setup,
   NULL,
   mtx2_execute
@@ -249,10 +240,6 @@ const struct testcase testmtx2 = {
  *   ^    - Priority transition (boost or return).
  * @endcode
  */
-static char *mtx3_gettest(void) {
-
-  return "Mutexes, priority inheritance, complex case";
-}
 
 static void mtx3_setup(void) {
 
@@ -337,7 +324,7 @@ static void mtx3_execute(void) {
 }
 
 const struct testcase testmtx3 = {
-  mtx3_gettest,
+  "Mutexes, priority inheritance, complex case",
   mtx3_setup,
   NULL,
   mtx3_execute
@@ -353,10 +340,6 @@ const struct testcase testmtx3 = {
  * The test expects that the priority changes caused by the priority
  * inheritance algorithm happen at the right moment and with the right values.
  */
-static char *mtx4_gettest(void) {
-
-  return "Mutexes, priority return";
-}
 
 static void mtx4_setup(void) {
 
@@ -429,7 +412,7 @@ static void mtx4_execute(void) {
 }
 
 const struct testcase testmtx4 = {
-  mtx4_gettest,
+  "Mutexes, priority return",
   mtx4_setup,
   NULL,
   mtx4_execute
@@ -444,10 +427,6 @@ const struct testcase testmtx4 = {
  * The test expects that the internal mutex status is consistent after each
  * operation.
  */
-static char *mtx5_gettest(void) {
-
-  return "Mutexes, status";
-}
 
 static void mtx5_setup(void) {
 
@@ -476,7 +455,7 @@ static void mtx5_execute(void) {
 }
 
 const struct testcase testmtx5 = {
-  mtx5_gettest,
+  "Mutexes, status",
   mtx5_setup,
   NULL,
   mtx5_execute
@@ -493,10 +472,6 @@ const struct testcase testmtx5 = {
  * The test expects the threads to reach their goal in increasing priority
  * order regardless of the initial order.
  */
-static char *mtx6_gettest(void) {
-
-  return "CondVar, signal test";
-}
 
 static void mtx6_setup(void) {
 
@@ -534,7 +509,7 @@ static void mtx6_execute(void) {
 }
 
 const struct testcase testmtx6 = {
-  mtx6_gettest,
+  "CondVar, signal test",
   mtx6_setup,
   NULL,
   mtx6_execute
@@ -549,10 +524,6 @@ const struct testcase testmtx6 = {
  * The test expects the threads to reach their goal in increasing priority
  * order regardless of the initial order.
  */
-static char *mtx7_gettest(void) {
-
-  return "CondVar, broadcast test";
-}
 
 static void mtx7_setup(void) {
 
@@ -575,7 +546,7 @@ static void mtx7_execute(void) {
 }
 
 const struct testcase testmtx7 = {
-  mtx7_gettest,
+  "CondVar, broadcast test",
   mtx7_setup,
   NULL,
   mtx7_execute
@@ -589,10 +560,6 @@ const struct testcase testmtx7 = {
  * conditional variable queue. It tests this very specific situation in order
  * to complete the code coverage.
  */
-static char *mtx8_gettest(void) {
-
-  return "CondVar, boost test";
-}
 
 static void mtx8_setup(void) {
 
@@ -637,7 +604,7 @@ static void mtx8_execute(void) {
 }
 
 const struct testcase testmtx8 = {
-  mtx8_gettest,
+  "CondVar, boost test",
   mtx8_setup,
   NULL,
   mtx8_execute