Improved test specifications generation.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9221 35acf78f-673a-0410-8e92-d51de3d6d3f4

14 files changed, 94 insertions, 16 deletions

diff --git a/test/nasa_osal/source/test/test_root.h b/test/nasa_osal/source/test/test_root.h
index b065fc63d..8da782715 100644
--- a/test/nasa_osal/source/test/test_root.h
+++ b/test/nasa_osal/source/test/test_root.h
@@ -5,8 +5,8 @@
  * @brief   Test Suite root structures header.

  */

 

-#ifndef _SPC5_TEST_ROOT_H_

-#define _SPC5_TEST_ROOT_H_

+#ifndef TEST_ROOT_H

+#define TEST_ROOT_H

 

 #include "test_sequence_001.h"

 #include "test_sequence_002.h"

@@ -46,4 +46,4 @@ extern THD_WORKING_AREA(wa_test4, TASKS_STACK_SIZE);
 

 #endif /* !defined(__DOXYGEN__) */

 

-#endif /* _SPC5_TEST_ROOT_H_ */

+#endif /* TEST_ROOT_H */

diff --git a/test/nasa_osal/source/test/test_sequence_001.c b/test/nasa_osal/source/test/test_sequence_001.c
index 253dc63c0..38a1bf351 100644
--- a/test/nasa_osal/source/test/test_sequence_001.c
+++ b/test/nasa_osal/source/test/test_sequence_001.c
@@ -5,6 +5,9 @@
 #include "test_root.h"

 

 /**

+ * @file    test_sequence_001.c

+ * @brief   Test Sequence 001 code.

+ *

  * @page test_sequence_001 [1] Tasks Functionality

  *

  * File: @ref test_sequence_001.c

diff --git a/test/nasa_osal/source/test/test_sequence_001.h b/test/nasa_osal/source/test/test_sequence_001.h
index bd39c2d2c..944739ef8 100644
--- a/test/nasa_osal/source/test/test_sequence_001.h
+++ b/test/nasa_osal/source/test/test_sequence_001.h
@@ -1,3 +1,13 @@
 /* Copyright statement.*/

 

+/**

+ * @file    test_sequence_001.h
+ * @brief   Test Sequence 001 header.

+ */

+

+#ifndef TEST_SEQUENCE_001_H

+#define TEST_SEQUENCE_001_H

+

 extern const testcase_t * const test_sequence_001[];

+

+#endif /* TEST_SEQUENCE_001_H */

diff --git a/test/nasa_osal/source/test/test_sequence_002.c b/test/nasa_osal/source/test/test_sequence_002.c
index 35a856882..0a67f296c 100644
--- a/test/nasa_osal/source/test/test_sequence_002.c
+++ b/test/nasa_osal/source/test/test_sequence_002.c
@@ -5,6 +5,9 @@
 #include "test_root.h"

 

 /**

+ * @file    test_sequence_002.c

+ * @brief   Test Sequence 002 code.

+ *

  * @page test_sequence_002 [2] Queues Functionality

  *

  * File: @ref test_sequence_002.c

diff --git a/test/nasa_osal/source/test/test_sequence_002.h b/test/nasa_osal/source/test/test_sequence_002.h
index 422e93896..4cc10eeb8 100644
--- a/test/nasa_osal/source/test/test_sequence_002.h
+++ b/test/nasa_osal/source/test/test_sequence_002.h
@@ -1,3 +1,13 @@
 /* Copyright statement.*/

 

+/**

+ * @file    test_sequence_002.h
+ * @brief   Test Sequence 002 header.

+ */

+

+#ifndef TEST_SEQUENCE_002_H

+#define TEST_SEQUENCE_002_H

+

 extern const testcase_t * const test_sequence_002[];

+

+#endif /* TEST_SEQUENCE_002_H */

diff --git a/test/nasa_osal/source/test/test_sequence_003.c b/test/nasa_osal/source/test/test_sequence_003.c
index e699248f1..56663666e 100644
--- a/test/nasa_osal/source/test/test_sequence_003.c
+++ b/test/nasa_osal/source/test/test_sequence_003.c
@@ -5,6 +5,9 @@
 #include "test_root.h"

 

 /**

+ * @file    test_sequence_003.c

+ * @brief   Test Sequence 003 code.

+ *

  * @page test_sequence_003 [3] Timers Functionality

  *

  * File: @ref test_sequence_003.c

diff --git a/test/nasa_osal/source/test/test_sequence_003.h b/test/nasa_osal/source/test/test_sequence_003.h
index 0cec58279..75e4209ca 100644
--- a/test/nasa_osal/source/test/test_sequence_003.h
+++ b/test/nasa_osal/source/test/test_sequence_003.h
@@ -1,3 +1,13 @@
 /* Copyright statement.*/

 

+/**

+ * @file    test_sequence_003.h
+ * @brief   Test Sequence 003 header.

+ */

+

+#ifndef TEST_SEQUENCE_003_H

+#define TEST_SEQUENCE_003_H

+

 extern const testcase_t * const test_sequence_003[];

+

+#endif /* TEST_SEQUENCE_003_H */

diff --git a/test/nasa_osal/source/test/test_sequence_004.c b/test/nasa_osal/source/test/test_sequence_004.c
index 6f2fa76c9..1ca5586e9 100644
--- a/test/nasa_osal/source/test/test_sequence_004.c
+++ b/test/nasa_osal/source/test/test_sequence_004.c
@@ -5,6 +5,9 @@
 #include "test_root.h"

 

 /**

+ * @file    test_sequence_004.c

+ * @brief   Test Sequence 004 code.

+ *

  * @page test_sequence_004 [4] Binary Semaphores Functionality

  *

  * File: @ref test_sequence_004.c

@@ -105,7 +108,7 @@ static void test_004_001_execute(void) {
      an error is expected.*/

   test_set_step(4);

   {

-    #if 0 /* Semaphore name currently not implemented.*/

+#if 0 /* Semaphore name currently not implemented.*/

     int32 err;

 

     err = OS_BinSemCreate(&bsid,

@@ -113,7 +116,7 @@ static void test_004_001_execute(void) {
                          0,

                          0);

     test_assert(err == OS_ERR_NAME_TOO_LONG, "name limit not detected");

-    #endif

+#endif

   }

 

   /* [4.1.5] OS_BinSemDelete() is invoked with timer_id set to -1, an

@@ -137,10 +140,10 @@ static void test_004_001_execute(void) {
     err = OS_BinSemCreate(&bsid1, "my semaphore", 0, 0);

     test_assert(err == OS_SUCCESS, "semaphore creation failed");

 

-    #if 0 /* Semaphore name currently not implemented.*/

+#if 0 /* Semaphore name currently not implemented.*/

     err = OS_BinSemCreate(&bsid2, "my semaphore", 0, 0);

     test_assert(err == OS_ERR_NAME_TAKEN, "name conflict not detected");

-    #endif

+#endif

 

     err = OS_BinSemDelete(bsid1);

     test_assert(err == OS_SUCCESS, "semaphore deletion failed");

diff --git a/test/nasa_osal/source/test/test_sequence_004.h b/test/nasa_osal/source/test/test_sequence_004.h
index 965f4b132..205176fb5 100644
--- a/test/nasa_osal/source/test/test_sequence_004.h
+++ b/test/nasa_osal/source/test/test_sequence_004.h
@@ -1,3 +1,13 @@
 /* Copyright statement.*/

 

+/**

+ * @file    test_sequence_004.h
+ * @brief   Test Sequence 004 header.

+ */

+

+#ifndef TEST_SEQUENCE_004_H

+#define TEST_SEQUENCE_004_H

+

 extern const testcase_t * const test_sequence_004[];

+

+#endif /* TEST_SEQUENCE_004_H */

diff --git a/test/nasa_osal/source/test/test_sequence_005.c b/test/nasa_osal/source/test/test_sequence_005.c
index 76c37bfa8..29537ca82 100644
--- a/test/nasa_osal/source/test/test_sequence_005.c
+++ b/test/nasa_osal/source/test/test_sequence_005.c
@@ -5,6 +5,9 @@
 #include "test_root.h"

 

 /**

+ * @file    test_sequence_005.c

+ * @brief   Test Sequence 005 code.

+ *

  * @page test_sequence_005 [5] Counter Semaphores Functionality

  *

  * File: @ref test_sequence_005.c

@@ -104,7 +107,7 @@ static void test_005_001_execute(void) {
      name, an error is expected.*/

   test_set_step(4);

   {

-    #if 0 /* Semaphore name currently not implemented.*/

+#if 0 /* Semaphore name currently not implemented.*/

     int32 err;

 

     err = OS_CountSemCreate(&csid,

@@ -112,7 +115,7 @@ static void test_005_001_execute(void) {
                             0,

                             0);

     test_assert(err == OS_ERR_NAME_TOO_LONG, "name limit not detected");

-    #endif

+#endif

   }

 

   /* [5.1.5] OS_CountSemDelete() is invoked with timer_id set to -1, an

@@ -136,10 +139,10 @@ static void test_005_001_execute(void) {
     err = OS_CountSemCreate(&csid1, "my semaphore", 0, 0);

     test_assert(err == OS_SUCCESS, "semaphore creation failed");

 

-    #if 0 /* Semaphore name currently not implemented.*/

+#if 0 /* Semaphore name currently not implemented.*/

     err = OS_CountSemCreate(&csid2, "my semaphore", 0, 0);

     test_assert(err == OS_ERR_NAME_TAKEN, "name conflict not detected");

-    #endif

+#endif

 

     err = OS_CountSemDelete(csid1);

     test_assert(err == OS_SUCCESS, "semaphore deletion failed");

diff --git a/test/nasa_osal/source/test/test_sequence_005.h b/test/nasa_osal/source/test/test_sequence_005.h
index 094222891..99ee7db5b 100644
--- a/test/nasa_osal/source/test/test_sequence_005.h
+++ b/test/nasa_osal/source/test/test_sequence_005.h
@@ -1,3 +1,13 @@
 /* Copyright statement.*/

 

+/**

+ * @file    test_sequence_005.h
+ * @brief   Test Sequence 005 header.

+ */

+

+#ifndef TEST_SEQUENCE_005_H

+#define TEST_SEQUENCE_005_H

+

 extern const testcase_t * const test_sequence_005[];

+

+#endif /* TEST_SEQUENCE_005_H */

diff --git a/test/nasa_osal/source/test/test_sequence_006.c b/test/nasa_osal/source/test/test_sequence_006.c
index fd99656e1..73e95cda9 100644
--- a/test/nasa_osal/source/test/test_sequence_006.c
+++ b/test/nasa_osal/source/test/test_sequence_006.c
@@ -5,6 +5,9 @@
 #include "test_root.h"

 

 /**

+ * @file    test_sequence_006.c

+ * @brief   Test Sequence 006 code.

+ *

  * @page test_sequence_006 [6] Mutex Semaphores Functionality

  *

  * File: @ref test_sequence_006.c

@@ -85,14 +88,14 @@ static void test_006_001_execute(void) {
      an error is expected.*/

   test_set_step(3);

   {

-    #if 0 /* Semaphore name currently not implemented.*/

+#if 0 /* Semaphore name currently not implemented.*/

     int32 err;

 

     err = OS_MutSemCreate(&msid,

                          "very very long semaphore name",   /* Error.*/

                          0);

     test_assert(err == OS_ERR_NAME_TOO_LONG, "name limit not detected");

-    #endif

+#endif

   }

 

   /* [6.1.4] OS_MutSemDelete() is invoked with timer_id set to -1, an

@@ -116,10 +119,10 @@ static void test_006_001_execute(void) {
     err = OS_MutSemCreate(&msid1, "my semaphore", 0);

     test_assert(err == OS_SUCCESS, "semaphore creation failed");

 

-    #if 0 /* Semaphore name currently not implemented.*/

+#if 0 /* Semaphore name currently not implemented.*/

     err = OS_MutSemCreate(&msid2, "my semaphore", 0);

     test_assert(err == OS_ERR_NAME_TAKEN, "name conflict not detected");

-    #endif

+#endif

 

     err = OS_MutSemDelete(msid1);

     test_assert(err == OS_SUCCESS, "semaphore deletion failed");

diff --git a/test/nasa_osal/source/test/test_sequence_006.h b/test/nasa_osal/source/test/test_sequence_006.h
index 0cbf01a81..ba52bf479 100644
--- a/test/nasa_osal/source/test/test_sequence_006.h
+++ b/test/nasa_osal/source/test/test_sequence_006.h
@@ -1,3 +1,13 @@
 /* Copyright statement.*/

 

+/**

+ * @file    test_sequence_006.h
+ * @brief   Test Sequence 006 header.

+ */

+

+#ifndef TEST_SEQUENCE_006_H

+#define TEST_SEQUENCE_006_H

+

 extern const testcase_t * const test_sequence_006[];

+

+#endif /* TEST_SEQUENCE_006_H */

diff --git a/test/nasa_osal/specgen/Doxyfile b/test/nasa_osal/specgen/Doxyfile
index 8691494a5..911615457 100644
--- a/test/nasa_osal/specgen/Doxyfile
+++ b/test/nasa_osal/specgen/Doxyfile
@@ -675,7 +675,7 @@ SHOW_USED_FILES        = NO
 # (if specified).

 # The default value is: YES.

 

-SHOW_FILES             = YES

+SHOW_FILES             = NO

 

 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces

 # page. This will remove the Namespaces entry from the Quick Index and from the