[rtems commit] score: Move <rtems/score/gcov.h>

Sebastian Huber sebh at rtems.org
Fri Jul 28 09:37:29 UTC 2023 

Module:    rtems
Branch:    master
Commit:    3ba43da922e92e76c159529acd6f868696923cb5
Changeset: http://git.rtems.org/rtems/commit/?id=3ba43da922e92e76c159529acd6f868696923cb5

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jul 28 11:55:01 2023 +0200

score: Move <rtems/score/gcov.h>

Move <rtems/score/gcov.h> to <rtems/test-gcov.h>.  These functions do
not belong to an super core service.

---

 cpukit/include/rtems/{score/gcov.h => test-gcov.h} | 14 +++++++-------
 cpukit/{score/src => libtest}/gcovdumpinfo.c       |  4 ++--
 cpukit/{score/src => libtest}/gcovdumpinfobase64.c |  4 ++--
 cpukit/{score/src => libtest}/gcovinfoset.c        |  4 ++--
 cpukit/libtest/testgcovbspreset.c                  |  2 +-
 cpukit/libtest/testgcovcpufatalhalt.c              |  2 +-
 cpukit/libtest/testgcovdumpinfo.c                  |  4 ++--
 spec/build/cpukit/librtemscpu.yml                  |  4 ----
 spec/build/cpukit/librtemstest.yml                 |  4 ++++
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cpukit/include/rtems/score/gcov.h b/cpukit/include/rtems/test-gcov.h
similarity index 92%
rename from cpukit/include/rtems/score/gcov.h
rename to cpukit/include/rtems/test-gcov.h
index ff8ad62a15..4c5bd44aab 100644
--- a/cpukit/include/rtems/score/gcov.h
+++ b/cpukit/include/rtems/test-gcov.h
@@ -3,10 +3,10 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreGcov
+ * @ingroup RTEMSTestGcov
  *
  * @brief This header file provides the interfaces of the
- *   @ref RTEMSScoreGcov.
+ *   @ref RTEMSTestGcov.
  */
 
 /*
@@ -34,8 +34,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _RTEMS_SCORE_GCOV_H
-#define _RTEMS_SCORE_GCOV_H
+#ifndef _RTEMS_TEST_GCOV_H
+#define _RTEMS_TEST_GCOV_H
 
 #include <gcov.h>
 
@@ -47,9 +47,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup RTEMSScoreGcov Gcov Support
+ * @defgroup RTEMSTestGcov Gcov Support
  *
- * @ingroup RTEMSScore
+ * @ingroup RTEMSTest
  *
  * @brief This group contains the gocv support.
  *
@@ -84,4 +84,4 @@ void _Gcov_Dump_info_base64( IO_Put_char put_char, void *arg );
 }
 #endif /* __cplusplus */
 
-#endif /* _RTEMS_SCORE_GCOV_H */
+#endif /* _RTEMS_TEST_GCOV_H */
diff --git a/cpukit/score/src/gcovdumpinfo.c b/cpukit/libtest/gcovdumpinfo.c
similarity index 97%
rename from cpukit/score/src/gcovdumpinfo.c
rename to cpukit/libtest/gcovdumpinfo.c
index be00df2db8..ad2cef4eae 100644
--- a/cpukit/score/src/gcovdumpinfo.c
+++ b/cpukit/libtest/gcovdumpinfo.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreIO
+ * @ingroup RTEMSTestFrameworkImpl
  *
  * @brief This source file contains the implementation of _Gcov_Ddump_info().
  */
@@ -37,7 +37,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/score/gcov.h>
+#include <rtems/test-gcov.h>
 
 typedef struct {
   IO_Put_char put_char;
diff --git a/cpukit/score/src/gcovdumpinfobase64.c b/cpukit/libtest/gcovdumpinfobase64.c
similarity index 97%
rename from cpukit/score/src/gcovdumpinfobase64.c
rename to cpukit/libtest/gcovdumpinfobase64.c
index b7a9849084..39b470fc55 100644
--- a/cpukit/score/src/gcovdumpinfobase64.c
+++ b/cpukit/libtest/gcovdumpinfobase64.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreIO
+ * @ingroup RTEMSTestFrameworkImpl
  *
  * @brief This source file contains the implementation of
  *   _Gcov_Dump_info_base64().
@@ -38,7 +38,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/score/gcov.h>
+#include <rtems/test-gcov.h>
 
 #include <limits.h>
 #include <string.h>
diff --git a/cpukit/score/src/gcovinfoset.c b/cpukit/libtest/gcovinfoset.c
similarity index 96%
rename from cpukit/score/src/gcovinfoset.c
rename to cpukit/libtest/gcovinfoset.c
index cb22e8252b..79114e4d67 100644
--- a/cpukit/score/src/gcovinfoset.c
+++ b/cpukit/libtest/gcovinfoset.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreIO
+ * @ingroup RTEMSTestFrameworkImpl
  *
  * @brief This source file contains the definition of the gcov information
  *   linker set.
@@ -38,6 +38,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/score/gcov.h>
+#include <rtems/test-gcov.h>
 
 RTEMS_LINKER_ROSET( gcov_info, const struct gcov_info * );
diff --git a/cpukit/libtest/testgcovbspreset.c b/cpukit/libtest/testgcovbspreset.c
index 2b1e399bc4..f40102c944 100644
--- a/cpukit/libtest/testgcovbspreset.c
+++ b/cpukit/libtest/testgcovbspreset.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTest
+ * @ingroup RTEMSTestFrameworkImpl
  *
  * @brief This source file contains the implementation of a wrapper for
  *   bsp_reset() which dumps the gcov information using
diff --git a/cpukit/libtest/testgcovcpufatalhalt.c b/cpukit/libtest/testgcovcpufatalhalt.c
index 55a4c3ee40..9ac242885b 100644
--- a/cpukit/libtest/testgcovcpufatalhalt.c
+++ b/cpukit/libtest/testgcovcpufatalhalt.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTest
+ * @ingroup RTEMSTestFrameworkImpl
  *
  * @brief This source file contains the implementation of a wrapper for
  *   _CPU_Fatal_halt() which dumps the gcov information using
diff --git a/cpukit/libtest/testgcovdumpinfo.c b/cpukit/libtest/testgcovdumpinfo.c
index 68ce0439fa..c1d07275e7 100644
--- a/cpukit/libtest/testgcovdumpinfo.c
+++ b/cpukit/libtest/testgcovdumpinfo.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTest
+ * @ingroup RTEMSTestFrameworkImpl
  *
  * @brief This source file contains the implementation of
  *   rtems_test_gcov_dump_info().
@@ -40,7 +40,7 @@
 
 #include <rtems/test-info.h>
 
-#include <rtems/score/gcov.h>
+#include <rtems/test-gcov.h>
 #include <rtems/score/isrlock.h>
 #include <rtems/bspIo.h>
 
diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index 411058ff8e..ff4ac8e944 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -345,7 +345,6 @@ install:
   - cpukit/include/rtems/score/coresemimpl.h
   - cpukit/include/rtems/score/exception.h
   - cpukit/include/rtems/score/freechain.h
-  - cpukit/include/rtems/score/gcov.h
   - cpukit/include/rtems/score/hash.h
   - cpukit/include/rtems/score/heap.h
   - cpukit/include/rtems/score/heapimpl.h
@@ -1412,9 +1411,6 @@ source:
 - cpukit/score/src/debugunreachable.c
 - cpukit/score/src/freechain.c
 - cpukit/score/src/futex.c
-- cpukit/score/src/gcovdumpinfobase64.c
-- cpukit/score/src/gcovdumpinfo.c
-- cpukit/score/src/gcovinfoset.c
 - cpukit/score/src/hash.c
 - cpukit/score/src/heap.c
 - cpukit/score/src/heapallocate.c
diff --git a/spec/build/cpukit/librtemstest.yml b/spec/build/cpukit/librtemstest.yml
index 4794312fa4..19b1066b27 100644
--- a/spec/build/cpukit/librtemstest.yml
+++ b/spec/build/cpukit/librtemstest.yml
@@ -12,10 +12,14 @@ install:
   source:
   - cpukit/include/rtems/test.h
   - cpukit/include/rtems/test-info.h
+  - cpukit/include/rtems/test-gcov.h
   - cpukit/include/rtems/test-scheduler.h
 install-path: ${BSP_LIBDIR}
 links: []
 source:
+- cpukit/libtest/gcovdumpinfobase64.c
+- cpukit/libtest/gcovdumpinfo.c
+- cpukit/libtest/gcovinfoset.c
 - cpukit/libtest/t-test-busy-tick.c
 - cpukit/libtest/t-test-busy.c
 - cpukit/libtest/t-test-checks-eno.c

More information about the vc mailing list