diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-05-24 20:17:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-05-24 20:17:29 +0000 |
commit | 3fa19f8e942178283e45d2a3e8df391e707c2dd0 (patch) | |
tree | e20b46fd58afdc3b27545c2bc750d23aa1189bc3 /rtems-coverage | |
parent | a30994b80d6742b29450daa1e337ecd9b18bb613 (diff) |
2010-05-24 Joel Sherrill <joel.sherrilL@OARcorp.com>
* rtems-cvs-20090806.diff, rtems-cvs-20090819.diff,
rtems-cvs-20091201.diff: Removed.
Diffstat (limited to 'rtems-coverage')
-rw-r--r-- | rtems-coverage/rtems-cvs-20090806.diff | 293 | ||||
-rw-r--r-- | rtems-coverage/rtems-cvs-20090819.diff | 808 | ||||
-rw-r--r-- | rtems-coverage/rtems-cvs-20091201.diff | 819 |
3 files changed, 0 insertions, 1920 deletions
diff --git a/rtems-coverage/rtems-cvs-20090806.diff b/rtems-coverage/rtems-cvs-20090806.diff deleted file mode 100644 index 21c5f83..0000000 --- a/rtems-coverage/rtems-cvs-20090806.diff +++ /dev/null @@ -1,293 +0,0 @@ -? cpukit/score/src/he1.diff -Index: cpukit/libcsupport/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/libcsupport/Makefile.am,v -retrieving revision 1.105 -diff -u -r1.105 Makefile.am ---- cpukit/libcsupport/Makefile.am 6 Aug 2009 20:37:32 -0000 1.105 -+++ cpukit/libcsupport/Makefile.am 6 Aug 2009 22:23:14 -0000 -@@ -113,6 +113,8 @@ - $(BSD_LIBC_C_FILES) $(BASE_FS_C_FILES) $(MALLOC_C_FILES) \ - $(ERROR_C_FILES) $(ASSOCIATION_C_FILES) - -+libcsupport_a_SOURCES += src/end_profile.c -+ - if UNIX - libcsupport_a_SOURCES += src/unixlibc.c src/unixlibc_io.c src/hosterr.c - else -Index: cpukit/posix/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/posix/Makefile.am,v -retrieving revision 1.67 -diff -u -r1.67 Makefile.am ---- cpukit/posix/Makefile.am 6 Aug 2009 21:45:28 -0000 1.67 -+++ cpukit/posix/Makefile.am 6 Aug 2009 22:23:14 -0000 -@@ -1,5 +1,5 @@ - ## --## $Id$ -+## $Id$ - ## - - include $(top_srcdir)/automake/multilib.am -@@ -11,6 +11,7 @@ - - AM_CPPFLAGS += -D__RTEMS_INSIDE__ - -+project_lib_LIBRARIES = libposix.a - noinst_LIBRARIES = libposix.a - libposix_a_CPPFLAGS = $(AM_CPPFLAGS) - libposix_a_SOURCES = -Index: cpukit/rtems/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/rtems/Makefile.am,v -retrieving revision 1.47 -diff -u -r1.47 Makefile.am ---- cpukit/rtems/Makefile.am 6 Aug 2009 20:38:00 -0000 1.47 -+++ cpukit/rtems/Makefile.am 6 Aug 2009 22:23:14 -0000 -@@ -7,6 +7,7 @@ - - AM_CPPFLAGS += -D__RTEMS_INSIDE__ - -+project_lib_LIBRARIES = librtems.a - noinst_LIBRARIES = librtems.a - librtems_a_CPPFLAGS = $(AM_CPPFLAGS) - -Index: cpukit/sapi/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/sapi/Makefile.am,v -retrieving revision 1.37 -diff -u -r1.37 Makefile.am ---- cpukit/sapi/Makefile.am 6 Aug 2009 20:38:24 -0000 1.37 -+++ cpukit/sapi/Makefile.am 6 Aug 2009 22:23:14 -0000 -@@ -21,6 +21,7 @@ - AM_CPPFLAGS += -D__RTEMS_INSIDE__ - - noinst_LIBRARIES = libsapi.a -+project_lib_LIBRARIES = libsapi.a - libsapi_a_SOURCES = src/debug.c src/extension.c src/extensioncreate.c \ - src/extensiondelete.c src/extensionident.c src/fatal.c src/exinit.c \ - src/exshutdown.c src/io.c src/ioclose.c src/iocontrol.c src/iodata.c \ -Index: cpukit/score/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/score/Makefile.am,v -retrieving revision 1.71 -diff -u -r1.71 Makefile.am ---- cpukit/score/Makefile.am 6 Aug 2009 20:39:27 -0000 1.71 -+++ cpukit/score/Makefile.am 6 Aug 2009 22:23:14 -0000 -@@ -73,6 +73,7 @@ - - AM_CPPFLAGS += -D__RTEMS_INSIDE__ - -+project_lib_LIBRARIES = libscore.a - noinst_LIBRARIES = libscore.a - libscore_a_SOURCES = - libscore_a_CPPFLAGS = $(AM_CPPFLAGS) -Index: c/src/make/leaf.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/leaf.cfg,v -retrieving revision 1.11 -diff -u -r1.11 leaf.cfg ---- c/src/make/leaf.cfg 15 Apr 2009 08:31:09 -0000 1.11 -+++ c/src/make/leaf.cfg 6 Aug 2009 22:23:14 -0000 -@@ -41,8 +41,9 @@ - # Create a RTEMS executable based on MANAGERS which was set in - # app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -- $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -+## XXX Joel make conditional -+## MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -+## $(MANAGERS_REQUIRED), $(MANAGER_LIST)) - - # Allow user to override link commands (to build a prom image, perhaps) - ifndef LINKCMDS -@@ -55,14 +56,25 @@ - - DOWNEXT=.ralf - -+ -+ifeq ($(ENABLE_COVERAGE),yes) -+COV_ARGS=-Wl,--undefined=rtems_task_create \ -+ -Wl,--undefined=pthread_create \ -+ -Wl,--undefined=end_of_profiling \ -+ -Wl,--whole-archive -lrtems -lsapi \ -+ -lscore -lposix -Wl,--no-whole-archive \ -+ -lcsupport -+ -+endif -+ - define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@)$(EXEEXT) $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@)$(EXEEXT) $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define default-bsp-post-link -Index: c/src/make/target.cfg.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/target.cfg.in,v -retrieving revision 1.7 -diff -u -r1.7 target.cfg.in ---- c/src/make/target.cfg.in 4 Aug 2007 05:45:16 -0000 1.7 -+++ c/src/make/target.cfg.in 6 Aug 2009 22:23:14 -0000 -@@ -55,6 +55,7 @@ - # Create a RTEMS executable based on MANAGERS which was set in - # app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -- $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -+## XXX Joel make conditional -+## MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -+## $(MANAGERS_REQUIRED), $(MANAGER_LIST)) - -Index: make/leaf.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/leaf.cfg,v -retrieving revision 1.24 -diff -u -r1.24 leaf.cfg ---- make/leaf.cfg 15 Sep 2008 17:43:22 -0000 1.24 -+++ make/leaf.cfg 6 Aug 2009 22:23:14 -0000 -@@ -116,14 +116,28 @@ - - DOWNEXT=.ralf - -+ifeq ($(ENABLE_COVERAGE),yes) -+ ifeq ($(HAS_POSIX),yes -+ COV_POSIX_UNDEFINE=-Wl,--undefined=pthread_create -+ COV_POSIX_LIB=-lposix -+ endif -+ COV_ARGS=-Wl,--undefined=rtems_task_create \ -+ -Wl,--undefined=pthread_create \ -+ $(COV_POSIX_UNDEFINE) -+ -Wl,--undefined=end_of_profiling \ -+ -Wl,--whole-archive -lrtems -lsapi \ -+ -lscore $(COV_POSIX_LIB) -Wl,--no-whole-archive \ -+ -lcsupport -+endif -+ - define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@).exe $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@).exe $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define default-bsp-post-link -Index: make/compilers/gcc-no_bsp.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/compilers/gcc-no_bsp.cfg,v -retrieving revision 1.14 -diff -u -r1.14 gcc-no_bsp.cfg ---- make/compilers/gcc-no_bsp.cfg 18 Sep 2008 17:33:55 -0000 1.14 -+++ make/compilers/gcc-no_bsp.cfg 6 Aug 2009 22:23:14 -0000 -@@ -201,8 +201,9 @@ - - # Create a RTEMS executable based on MANAGERS which was set in app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS), $(MANAGER_LIST)) --MANAGERS_NOT_WANTED:=$(filter-out $(MANAGERS_REQUIRED), $(MANAGERS_NOT_WANTED)) -+## XXX JOEL make conditional -+## MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS), $(MANAGER_LIST)) -+## MANAGERS_NOT_WANTED:=$(filter-out $(MANAGERS_REQUIRED), $(MANAGERS_NOT_WANTED)) - - CONSTRUCTOR= - -Index: make/custom/edb7312.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/custom/edb7312.cfg,v -retrieving revision 1.8 -diff -u -r1.8 edb7312.cfg ---- make/custom/edb7312.cfg 6 Mar 2008 21:51:00 -0000 1.8 -+++ make/custom/edb7312.cfg 6 Aug 2009 22:23:14 -0000 -@@ -18,4 +18,6 @@ - CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8 - - # optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+CFLAGS_OPTIMIZE_V = -Os -g -+ -+ENABLE_COVERAGE=yes -Index: make/custom/erc32.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/custom/erc32.cfg,v -retrieving revision 1.37 -diff -u -r1.37 erc32.cfg ---- make/custom/erc32.cfg 1 Oct 2008 13:19:51 -0000 1.37 -+++ make/custom/erc32.cfg 6 Aug 2009 22:23:14 -0000 -@@ -18,4 +18,6 @@ - CPU_CFLAGS = -mcpu=cypress - - # optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+CFLAGS_OPTIMIZE_V = -Os -g -+ -+ENABLE_COVERAGE=yes -Index: make/custom/gumstix.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/custom/gumstix.cfg,v -retrieving revision 1.1 -diff -u -r1.1 gumstix.cfg ---- make/custom/gumstix.cfg 4 Jun 2009 16:33:04 -0000 1.1 -+++ make/custom/gumstix.cfg 6 Aug 2009 22:23:14 -0000 -@@ -17,4 +17,6 @@ - CPU_CFLAGS = -mcpu=xscale -mstructure-size-boundary=8 - - # optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+CFLAGS_OPTIMIZE_V = -Os -g -+ -+ENABLE_COVERAGE=yes -Index: make/custom/leon2.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/custom/leon2.cfg,v -retrieving revision 1.14 -diff -u -r1.14 leon2.cfg ---- make/custom/leon2.cfg 6 Mar 2008 21:51:01 -0000 1.14 -+++ make/custom/leon2.cfg 6 Aug 2009 22:23:14 -0000 -@@ -16,4 +16,6 @@ - CPU_CFLAGS = -mcpu=cypress -msoft-float - - # optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+CFLAGS_OPTIMIZE_V = -Os -g -+ -+ENABLE_COVERAGE=yes -Index: make/custom/leon3.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/custom/leon3.cfg,v -retrieving revision 1.9 -diff -u -r1.9 leon3.cfg ---- make/custom/leon3.cfg 6 Mar 2008 21:51:01 -0000 1.9 -+++ make/custom/leon3.cfg 6 Aug 2009 22:23:14 -0000 -@@ -18,4 +18,6 @@ - CPU_CFLAGS = -mcpu=cypress -msoft-float - - # optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+CFLAGS_OPTIMIZE_V = -Os -g -+ -+ENABLE_COVERAGE=yes -Index: make/custom/rtl22xx.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/custom/rtl22xx.cfg,v -retrieving revision 1.5 -diff -u -r1.5 rtl22xx.cfg ---- make/custom/rtl22xx.cfg 6 Mar 2008 21:51:01 -0000 1.5 -+++ make/custom/rtl22xx.cfg 6 Aug 2009 22:23:14 -0000 -@@ -22,3 +22,5 @@ - # NOTE2: some level of -O may be actually required by inline assembler (at least - # -O2 so far. - CFLAGS_OPTIMIZE_V = -Os -g -DNDEBUG -+ -+ENABLE_COVERAGE=yes diff --git a/rtems-coverage/rtems-cvs-20090819.diff b/rtems-coverage/rtems-cvs-20090819.diff deleted file mode 100644 index d782df7..0000000 --- a/rtems-coverage/rtems-cvs-20090819.diff +++ /dev/null @@ -1,808 +0,0 @@ -Index: configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/configure.ac,v -retrieving revision 1.29 -diff -u -r1.29 configure.ac ---- configure.ac 1 Jun 2008 05:07:57 -0000 1.29 -+++ configure.ac 19 Aug 2009 16:42:03 -0000 -@@ -26,6 +26,7 @@ - RTEMS_ENABLE_ITRON - RTEMS_ENABLE_NETWORKING - RTEMS_ENABLE_CXX -+RTEMS_ENABLE_COVERAGE - RTEMS_ENABLE_TESTS - RTEMS_ENABLE_RTEMS_DEBUG - RTEMS_ENABLE_RTEMSBSP -Index: aclocal/enable-coverage.m4 -=================================================================== -RCS file: aclocal/enable-coverage.m4 -diff -N aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ aclocal/enable-coverage.m4 19 Aug 2009 16:42:03 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: c/src/make/Makefile.inc.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/Makefile.inc.in,v -retrieving revision 1.11 -diff -u -r1.11 Makefile.inc.in ---- c/src/make/Makefile.inc.in 18 Sep 2007 17:55:35 -0000 1.11 -+++ c/src/make/Makefile.inc.in 19 Aug 2009 16:42:03 -0000 -@@ -40,6 +40,7 @@ - RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ - RTEMS_HAS_ITRON_API = @RTEMS_HAS_ITRON_API@ - RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ -+RTEMS_HAS_COVERAGE = @RTEMS_HAS_COVERAGE@ - - export RTEMS_BSP - export RTEMS_CUSTOM -Index: c/src/make/bsp.cfg.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/bsp.cfg.in,v -retrieving revision 1.5 -diff -u -r1.5 bsp.cfg.in ---- c/src/make/bsp.cfg.in 4 Aug 2007 05:45:16 -0000 1.5 -+++ c/src/make/bsp.cfg.in 19 Aug 2009 16:42:03 -0000 -@@ -26,6 +26,11 @@ - HAS_CPLUSPLUS = @HAS_CPLUSPLUS@ - - ## -+## Is this BSP being built to do coverage testing? -+## -+RTEMS_HAS_COVERAGE = @RTEMS_HAS_COVERAGE@ -+ -+## - ## Does this BSP support RTEMS's networking ? - ## - HAS_NETWORKING = @HAS_NETWORKING@ -Index: c/src/make/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/configure.ac,v -retrieving revision 1.27 -diff -u -r1.27 configure.ac ---- c/src/make/configure.ac 2 Aug 2007 14:59:41 -0000 1.27 -+++ c/src/make/configure.ac 19 Aug 2009 16:42:03 -0000 -@@ -23,6 +23,7 @@ - RTEMS_ENABLE_NETWORKING - RTEMS_ENABLE_CXX - RTEMS_ENABLE_BARE -+RTEMS_ENABLE_COVERAGE - - RTEMS_ENV_RTEMSBSP - -@@ -69,6 +70,7 @@ - - AC_SUBST(rtems_cv_prog_cc_cross) - AC_SUBST(RTEMS_HAS_CPLUSPLUS) -+AC_SUBST(RTEMS_HAS_COVERAGE) - AC_SUBST(BARE_CPU_CFLAGS) - AC_SUBST(BARE_CPU_MODEL) - AC_SUBST(program_prefix) -Index: c/src/make/leaf.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/leaf.cfg,v -retrieving revision 1.11 -diff -u -r1.11 leaf.cfg ---- c/src/make/leaf.cfg 15 Apr 2009 08:31:09 -0000 1.11 -+++ c/src/make/leaf.cfg 19 Aug 2009 16:42:03 -0000 -@@ -41,8 +41,10 @@ - # Create a RTEMS executable based on MANAGERS which was set in - # app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -- $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -+ifneq ($(RTEMS_HAS_COVERAGE),yes) -+ MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -+ $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -+endif - - # Allow user to override link commands (to build a prom image, perhaps) - ifndef LINKCMDS -@@ -55,14 +57,18 @@ - - DOWNEXT=.ralf - -+ifeq ($(RTEMS_HAS_COVERAGE),yes) -+ COV_ARGS=$(PROJECT_RELEASE)/lib/rtems_coverage.o -+endif -+ - define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@)$(EXEEXT) $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@)$(EXEEXT) $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define default-bsp-post-link -Index: c/src/make/target.cfg.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/target.cfg.in,v -retrieving revision 1.7 -diff -u -r1.7 target.cfg.in ---- c/src/make/target.cfg.in 4 Aug 2007 05:45:16 -0000 1.7 -+++ c/src/make/target.cfg.in 19 Aug 2009 16:42:03 -0000 -@@ -37,6 +37,7 @@ - RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@ - RTEMS_HAS_RDBG = no - RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ -+RTEMS_HAS_COVERAGE = @RTEMS_HAS_COVERAGE@ - RTEMS_CPU = @RTEMS_CPU@ - - XCFLAGS=$(CFLAGS_FOR_TARGET) -@@ -55,6 +56,7 @@ - # Create a RTEMS executable based on MANAGERS which was set in - # app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -+ifneq ($(RTEMS_HAS_COVERAGE),yes) -+ MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ - $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -- -+endif -Index: c/src/make/aclocal/enable-coverage.m4 -=================================================================== -RCS file: c/src/make/aclocal/enable-coverage.m4 -diff -N c/src/make/aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ c/src/make/aclocal/enable-coverage.m4 19 Aug 2009 16:42:03 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: cpukit/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/Makefile.am,v -retrieving revision 1.89 -diff -u -r1.89 Makefile.am ---- cpukit/Makefile.am 5 Aug 2009 19:37:54 -0000 1.89 -+++ cpukit/Makefile.am 19 Aug 2009 16:42:03 -0000 -@@ -16,6 +16,9 @@ - SUBDIRS += libmd - SUBDIRS += libgnat - SUBDIRS += wrapup -+if ENABLE_COVERAGE -+SUBDIRS += wrapup-coverage -+endif - - SUBDIRS += zlib - -Index: cpukit/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/configure.ac,v -retrieving revision 1.163 -diff -u -r1.163 configure.ac ---- cpukit/configure.ac 10 Jul 2009 20:32:48 -0000 1.163 -+++ cpukit/configure.ac 19 Aug 2009 16:42:03 -0000 -@@ -18,6 +18,7 @@ - RTEMS_ENABLE_ITRON - RTEMS_ENABLE_RTEMS_DEBUG - RTEMS_ENABLE_NETWORKING -+RTEMS_ENABLE_COVERAGE - - RTEMS_ENV_RTEMSCPU - RTEMS_CHECK_RTEMS_DEBUG -@@ -185,6 +186,11 @@ - [1], - [if networking is enabled]) - -+RTEMS_CPUOPT([RTEMS_COVERAGE], -+ [test x"$RTEMS_HAS_COVERAGE" = xyes], -+ [1], -+ [to indicate this is a coverage build]) -+ - RTEMS_CPUOPT([RTEMS_UNIX], - [test x"$RTEMS_CPU" = xunix], - [1], -@@ -323,6 +329,10 @@ - && test x"$ac_cv_type_uint8_t" = xyes \ - && test x"$ac_cv_type_uint16_t" = xyes]) - -+AM_CONDITIONAL(ENABLE_COVERAGE,test x"$RTEMS_HAS_COVERAGE" = x"yes") -+AM_CONDITIONAL(ENABLE_EXPERIMENTAL_COVERAGE, \ -+ test x"$RTEMS_HAS_EXPERIMENTAL_COVERAGE" = x"yes") -+ - AC_CONFIG_HEADER(config.h) - - ## These are needed by the NFS Client -@@ -376,7 +386,9 @@ - telnetd/Makefile - pppd/Makefile - shttpd/Makefile --wrapup/Makefile]) -+wrapup/Makefile -+wrapup-coverage/Makefile -+]) - - AC_CONFIG_COMMANDS([preinstall-stamp], - [test -z "$with_multisubdir" && ${MAKE} preinstall-stamp], -Index: cpukit/aclocal/enable-coverage.m4 -=================================================================== -RCS file: cpukit/aclocal/enable-coverage.m4 -diff -N cpukit/aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/aclocal/enable-coverage.m4 19 Aug 2009 16:42:03 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: cpukit/wrapup-coverage/.cvsignore -=================================================================== -RCS file: cpukit/wrapup-coverage/.cvsignore -diff -N cpukit/wrapup-coverage/.cvsignore ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/.cvsignore 19 Aug 2009 16:42:04 -0000 -@@ -0,0 +1,2 @@ -+Makefile -+Makefile.in -Index: cpukit/wrapup-coverage/Makefile.am -=================================================================== -RCS file: cpukit/wrapup-coverage/Makefile.am -diff -N cpukit/wrapup-coverage/Makefile.am ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/Makefile.am 19 Aug 2009 16:42:04 -0000 -@@ -0,0 +1,135 @@ -+## -+## $Id$ -+## -+ -+include $(top_srcdir)/automake/multilib.am -+include $(top_srcdir)/automake/compile.am -+ -+## Setup the variant build subdirectory -+ARCH = o-optimize -+ -+noinst_LIBRARIES = libcoverage.a -+project_lib_DATA = rtems_coverage.o -+libcoverage_a_SOURCES = -+ -+noinst_LIBRARIES += libsupp.a -+libsupp_a_SOURCES = start_coverage.c end_coverage.c -+ -+TMP_LIBS = -+# Only do coverage on portable code at this point -+#TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a -+TMP_LIBS += ../score/libscore.a -+TMP_LIBS += ../sapi/libsapi.a -+TMP_LIBS += ../rtems/librtems.a -+ -+if LIBPOSIX -+TMP_LIBS += ../posix/libposix.a -+endif -+ -+if LIBGNAT -+#TMP_LIBS += ../libgnat/libgnat.a -+endif -+ -+if LIBITRON -+## Deprecated do not do coverage on ITRON -+#TMP_LIBS += ../itron/libitron.a -+endif -+ -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libcsupport/libcsupport.a -+endif -+ -+#if !UNIX -+#TMP_LIBS += ../libblock/libblock.a -+#endif -+#if LIBDOSFS -+#TMP_LIBS += ../libfs/libdosfs.a -+#endif -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libfs/libimfs.a -+endif -+ -+#TMP_LIBS += ../libmisc/libmonitor.a -+## TODO: Coverage test libuntar -+#TMP_LIBS += ../libmisc/libuntar.a -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libmisc/libstackchk.a -+TMP_LIBS += ../libmisc/libcpuuse.a -+endif -+ -+#if LIBSHELL -+#TMP_LIBS += ../libmisc/libshell.a -+#endif -+ -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libmisc/libbspcmdline.a -+endif -+#TMP_LIBS += ../libmisc/libcapture.a -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libmisc/libdumpbuf.a -+TMP_LIBS += ../libmisc/libdevnull.a -+endif -+ -+## Dummy is dummy configuration -- DO NOT INCLUDE IT IN COVERAGE -+#TMP_LIBS += ../libmisc/libdummy.a -+ -+#TMP_LIBS += ../libmisc/libfsmount.a -+#TMP_LIBS += ../libmisc/libmw-fb.a -+#TMP_LIBS += ../libmisc/libstringto.a -+#TMP_LIBS += ../libmisc/libuuid.a -+ -+#TMP_LIBS += ../libi2c/libi2c.a -+ -+## Do not coverage test networking code -+#if LIBNETWORKING -+#TMP_LIBS += ../libnetworking/libnetworking.a -+#TMP_LIBS += ../libnetworking/libc.a -+#TMP_LIBS += ../libnetworking/lib.a -+#endif -+ -+#if LIBRPC -+#TMP_LIBS += ../librpc/librpc.a -+#TMP_LIBS += ../librpc/libxdr.a -+#endif -+ -+## TODO: Coverage test libmd -+#if NEWLIB -+#TMP_LIBS += ../libmd/libmd.a -+#endif -+ -+rtems_coverage.o: start_coverage.o end_coverage.o $(TMP_LIBS) -+ rm -f $@ -+ $(MKDIR_P) $(ARCH) -+ rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel -+ for f in $(TMP_LIBS); do \ -+ case $$f in \ -+ *.$(OBJEXT) | *.rel) \ -+ if test -f $(ARCH)/`basename $$f`; then \ -+ if cmp $$f $(ARCH)/`basename $$f`; then \ -+ true; \ -+ else \ -+ echo 1>&2 "ERROR -- `basename $$f` in multiple files"; \ -+ exit 1; \ -+ fi; \ -+ else \ -+ cp $$f $(ARCH)/; \ -+ chmod a-w $(ARCH)/`basename $$f`; \ -+ fi; \ -+ ;; \ -+ *.a) \ -+ cd $(ARCH); \ -+ $(AR) xv ../$$f || exit 1; \ -+ chmod a-w * ; \ -+ cd ..; \ -+ ;; \ -+ esac; \ -+ done -+ ls $(ARCH)/* > $@-list -+ $(AR:ar=ld) -r -o $@ start_coverage.o @$@-list end_coverage.o -+ rm -f $@-list $(1)/*.$(OBJEXT) $(1)/*.rel -+ rm -rf $(1) -+ -+all-local: $(TMPINSTALL_FILES) -+ -+include $(srcdir)/preinstall.am -+include $(top_srcdir)/automake/local.am -Index: cpukit/wrapup-coverage/end_coverage.c -=================================================================== -RCS file: cpukit/wrapup-coverage/end_coverage.c -diff -N cpukit/wrapup-coverage/end_coverage.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/end_coverage.c 19 Aug 2009 16:42:04 -0000 -@@ -0,0 +1,2 @@ -+void end_coverage(void){} -+ -Index: cpukit/wrapup-coverage/preinstall.am -=================================================================== -RCS file: cpukit/wrapup-coverage/preinstall.am -diff -N cpukit/wrapup-coverage/preinstall.am ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/preinstall.am 19 Aug 2009 16:42:04 -0000 -@@ -0,0 +1,24 @@ -+## Automatically generated by ampolish3 - Do not edit -+ -+if AMPOLISH3 -+$(srcdir)/preinstall.am: Makefile.am -+ $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -+endif -+ -+PREINSTALL_DIRS = -+DISTCLEANFILES = $(PREINSTALL_DIRS) -+ -+all-local: $(TMPINSTALL_FILES) -+ -+TMPINSTALL_FILES = -+CLEANFILES = $(TMPINSTALL_FILES) -+ -+$(PROJECT_LIB)/$(dirstamp): -+ @$(MKDIR_P) $(PROJECT_LIB) -+ @: > $(PROJECT_LIB)/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) -+ -+$(PROJECT_LIB)/rtems_coverage.o: rtems_coverage.o $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_coverage.o -+TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_coverage.o -+ -Index: cpukit/wrapup-coverage/start_coverage.c -=================================================================== -RCS file: cpukit/wrapup-coverage/start_coverage.c -diff -N cpukit/wrapup-coverage/start_coverage.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/start_coverage.c 19 Aug 2009 16:42:04 -0000 -@@ -0,0 +1 @@ -+void start_coverage(void){} -Index: make/leaf.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/leaf.cfg,v -retrieving revision 1.24 -diff -u -r1.24 leaf.cfg ---- make/leaf.cfg 15 Sep 2008 17:43:22 -0000 1.24 -+++ make/leaf.cfg 19 Aug 2009 16:42:04 -0000 -@@ -116,14 +116,18 @@ - - DOWNEXT=.ralf - -+ifeq ($(RTEMS_HAS_COVERAGE),yes) -+ COV_ARGS=$(PROJECT_RELEASE)/lib/rtems_coverage.o -+endif -+ - define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@).exe $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@).exe $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define default-bsp-post-link -Index: make/compilers/gcc-no_bsp.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/compilers/gcc-no_bsp.cfg,v -retrieving revision 1.14 -diff -u -r1.14 gcc-no_bsp.cfg ---- make/compilers/gcc-no_bsp.cfg 18 Sep 2008 17:33:55 -0000 1.14 -+++ make/compilers/gcc-no_bsp.cfg 19 Aug 2009 16:42:04 -0000 -@@ -201,8 +201,10 @@ - - # Create a RTEMS executable based on MANAGERS which was set in app's Makefile - -+ifneq ($(RTEMS_HAS_COVERAGE),yes) - MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS), $(MANAGER_LIST)) - MANAGERS_NOT_WANTED:=$(filter-out $(MANAGERS_REQUIRED), $(MANAGERS_NOT_WANTED)) -+endif - - CONSTRUCTOR= - -Index: make/compilers/gcc-target-default.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/compilers/gcc-target-default.cfg,v -retrieving revision 1.40 -diff -u -r1.40 gcc-target-default.cfg ---- make/compilers/gcc-target-default.cfg 18 Sep 2008 17:33:55 -0000 1.40 -+++ make/compilers/gcc-target-default.cfg 19 Aug 2009 16:42:04 -0000 -@@ -192,3 +192,9 @@ - $(LINK.c) $(CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ - -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^ - endef -+ -+ifeq ($(RTEMS_HAS_COVERAGE),yes) -+ CFLAGS_OPTIMIZE_V = -Os -g -+else -+ CFLAGS_OPTIMIZE_V = -O2 -g -+endif -Index: testsuites/aclocal/enable-coverage.m4 -=================================================================== -RCS file: testsuites/aclocal/enable-coverage.m4 -diff -N testsuites/aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuites/aclocal/enable-coverage.m4 19 Aug 2009 16:42:04 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: testsuites/itrontests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/itrontests/configure.ac,v -retrieving revision 1.19 -diff -u -r1.19 configure.ac ---- testsuites/itrontests/configure.ac 2 Dec 2006 06:05:03 -0000 1.19 -+++ testsuites/itrontests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -12,7 +12,6 @@ - AM_INIT_AUTOMAKE([no-define foreign 1.10]) - AM_MAINTAINER_MODE - -- - RTEMS_ENV_RTEMSBSP - - RTEMS_PROJECT_ROOT -@@ -23,6 +22,8 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) - - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile -Index: testsuites/libtests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/libtests/configure.ac,v -retrieving revision 1.23 -diff -u -r1.23 configure.ac ---- testsuites/libtests/configure.ac 15 Aug 2009 17:54:48 -0000 1.23 -+++ testsuites/libtests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -28,9 +28,11 @@ - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - RTEMS_CHECK_CXX(RTEMS_BSP) - -- - AM_CONDITIONAL(HAS_CXX,test "$rtems_cv_HAS_CPLUSPLUS" = "yes") - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - bspcmdline01/Makefile -Index: testsuites/mptests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/mptests/configure.ac,v -retrieving revision 1.21 -diff -u -r1.21 configure.ac ---- testsuites/mptests/configure.ac 2 Dec 2006 06:05:19 -0000 1.21 -+++ testsuites/mptests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -31,6 +31,9 @@ - AC_ARG_VAR([MAX_LONG_TEST_DURATION], - [The longest length of time a "long running" test should run]) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - mp01/Makefile -Index: testsuites/psxtests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/psxtests/configure.ac,v -retrieving revision 1.50 -diff -u -r1.50 configure.ac ---- testsuites/psxtests/configure.ac 17 Aug 2009 17:44:36 -0000 1.50 -+++ testsuites/psxtests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -24,6 +24,9 @@ - - AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"]) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - psx01/Makefile -Index: testsuites/psxtests/psx09/init.c -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/psxtests/psx09/init.c,v -retrieving revision 1.11 -diff -u -r1.11 init.c ---- testsuites/psxtests/psx09/init.c 11 May 2009 01:41:15 -0000 1.11 -+++ testsuites/psxtests/psx09/init.c 19 Aug 2009 16:42:04 -0000 -@@ -52,6 +52,8 @@ - struct sched_param schedparam; - char buffer[ 80 ]; - pthread_mutexattr_t attr; -+ time_t start; -+ time_t now; - - puts( "\n\n*** POSIX TEST 9 ***" ); - -@@ -111,7 +113,6 @@ - - empty_line(); - -- - status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); - -@@ -135,10 +136,7 @@ - status = pthread_mutexattr_init( &attr ); - assert( !status ); - -- status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_PROTECT ); -- assert( !status ); -- -- status = pthread_mutexattr_setprioceiling( &attr, MEDIUM_PRIORITY ); -+ status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT ); - assert( !status ); - - puts( "Init: Creating a mutex" ); -@@ -154,25 +152,33 @@ - sprintf( buffer, " - new priority = %d", priority ); - print_current_time( "Init: ", buffer ); - -- /* go into a loop consuming CPU time to watch our priority lower */ -+ /* go into a loop consuming CPU time to watch our priority NOT lower */ -+ -+ start = time( &start ); -+ -+ puts( "Init: pthread_mutex_lock acquire the lock" ); -+ status = pthread_mutex_lock( &Mutex_id ); -+ if ( status ) -+ printf( "status = %d %s\n", status, strerror(status) ); -+ assert( !status ); - - for ( ; ; ) { - status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); - -- if ( schedparam.sched_priority != LOW_PRIORITY ) -- continue; -+ if ( schedparam.sched_priority == LOW_PRIORITY ) { -+ puts( "ERROR - Init's priority lowered while holding mutex" ); -+ rtems_test_exit(0); -+ } -+ -+ now = time( &now ); -+ if ( now - start > 3 ) -+ break; - - priority = schedparam.sched_priority; - sprintf( buffer, " - new priority = %d", priority ); - print_current_time( "Init: ", buffer ); - -- puts( "Init: pthread_mutex_lock acquire the lock" ); -- status = pthread_mutex_lock( &Mutex_id ); -- if ( status ) -- printf( "status = %d\n", status ); -- assert( !status ); -- - status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); - assert( !status ); - -@@ -183,20 +189,6 @@ - break; - } - -- /* now spin waiting for our budget to be replenished */ -- -- for ( ; ; ) { -- status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam ); -- assert( !status ); -- -- if ( schedparam.sched_priority == HIGH_PRIORITY ) -- break; -- } -- -- priority = schedparam.sched_priority; -- sprintf( buffer, " - new priority = %d", priority ); -- print_current_time( "Init: ", buffer ); -- - /* with this unlock we should be able to go to low priority */ - - puts( "Init: unlock mutex" ); -Index: testsuites/samples/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/samples/configure.ac,v -retrieving revision 1.29 -diff -u -r1.29 configure.ac ---- testsuites/samples/configure.ac 17 Aug 2007 01:07:10 -0000 1.29 -+++ testsuites/samples/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -58,6 +58,9 @@ - #FIXME: We should use a feature based check - AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"]) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - base_sp/Makefile -Index: testsuites/sptests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/sptests/configure.ac,v -retrieving revision 1.80 -diff -u -r1.80 configure.ac ---- testsuites/sptests/configure.ac 12 Aug 2009 13:09:36 -0000 1.80 -+++ testsuites/sptests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -1,6 +1,6 @@ - ## Process this file with autoconf to produce a configure script. - ## --## $Id$ -+## $Id$ - - AC_PREREQ(2.60) - AC_INIT([rtems-c-src-tests-sptests],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) -@@ -23,6 +23,9 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - sp01/Makefile -Index: testsuites/tmitrontests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/tmitrontests/configure.ac,v -retrieving revision 1.20 -diff -u -r1.20 configure.ac ---- testsuites/tmitrontests/configure.ac 2 Dec 2006 06:05:51 -0000 1.20 -+++ testsuites/tmitrontests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -23,6 +23,9 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - - OPERATION_COUNT=${OPERATION_COUNT-100} - AC_SUBST(OPERATION_COUNT) -Index: testsuites/tmtests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/tmtests/configure.ac,v -retrieving revision 1.20 -diff -u -r1.20 configure.ac ---- testsuites/tmtests/configure.ac 2 Dec 2006 06:05:59 -0000 1.20 -+++ testsuites/tmtests/configure.ac 19 Aug 2009 16:42:04 -0000 -@@ -24,6 +24,9 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - - OPERATION_COUNT=${OPERATION_COUNT-100} - AC_SUBST(OPERATION_COUNT) diff --git a/rtems-coverage/rtems-cvs-20091201.diff b/rtems-coverage/rtems-cvs-20091201.diff deleted file mode 100644 index 8a33877..0000000 --- a/rtems-coverage/rtems-cvs-20091201.diff +++ /dev/null @@ -1,819 +0,0 @@ -Index: configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/configure.ac,v -retrieving revision 1.29 -diff -u -r1.29 configure.ac ---- configure.ac 1 Jun 2008 05:07:57 -0000 1.29 -+++ configure.ac 1 Dec 2009 22:25:23 -0000 -@@ -26,6 +26,7 @@ - RTEMS_ENABLE_ITRON - RTEMS_ENABLE_NETWORKING - RTEMS_ENABLE_CXX -+RTEMS_ENABLE_COVERAGE - RTEMS_ENABLE_TESTS - RTEMS_ENABLE_RTEMS_DEBUG - RTEMS_ENABLE_RTEMSBSP -Index: aclocal/enable-coverage.m4 -=================================================================== -RCS file: aclocal/enable-coverage.m4 -diff -N aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ aclocal/enable-coverage.m4 1 Dec 2009 22:25:23 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg,v -retrieving revision 1.2 -diff -u -r1.2 edb7312.cfg ---- c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg 21 Oct 2009 10:34:39 -0000 1.2 -+++ c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg 1 Dec 2009 22:25:23 -0000 -@@ -14,5 +14,5 @@ - # - CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -mstructure-size-boundary=8 - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g -Index: c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg,v -retrieving revision 1.2 -diff -u -r1.2 smdk2410.cfg ---- c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg 21 Oct 2009 10:34:49 -0000 1.2 -+++ c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg 1 Dec 2009 22:25:24 -0000 -@@ -13,5 +13,5 @@ - # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu=arm920t -DCPU_S3C2410 -mstructure-size-boundary=32 - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g -Index: c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg,v -retrieving revision 1.2 -diff -u -r1.2 pc386.cfg ---- c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg 21 Oct 2009 10:42:25 -0000 1.2 -+++ c/src/lib/libbsp/i386/pc386/make/custom/pc386.cfg 1 Dec 2009 22:25:24 -0000 -@@ -19,8 +19,8 @@ - CPU_CFLAGS = -mtune=i386 - endif - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g - - # Here is the rule to actually build a $(ARCH)/foo.exe - # It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm -Index: c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg,v -retrieving revision 1.2 -diff -u -r1.2 uC5282.cfg ---- c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg 21 Oct 2009 10:48:44 -0000 1.2 -+++ c/src/lib/libbsp/m68k/uC5282/make/custom/uC5282.cfg 1 Dec 2009 22:25:24 -0000 -@@ -13,8 +13,8 @@ - # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu=5282 - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g - - define bsp-post-link - $(default-bsp-post-link) -Index: c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg,v -retrieving revision 1.2 -diff -u -r1.2 qemuppc.cfg ---- c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg 21 Oct 2009 10:53:42 -0000 1.2 -+++ c/src/lib/libbsp/powerpc/qemuppc/make/custom/qemuppc.cfg 1 Dec 2009 22:25:24 -0000 -@@ -13,8 +13,8 @@ - # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu=603e -Dppc603e - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g -fno-keep-inline-functions - - define bsp-post-link - $(default-bsp-post-link) -Index: c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg,v -retrieving revision 1.2 -diff -u -r1.2 erc32.cfg ---- c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg 21 Oct 2009 10:56:45 -0000 1.2 -+++ c/src/lib/libbsp/sparc/erc32/make/custom/erc32.cfg 1 Dec 2009 22:25:24 -0000 -@@ -14,5 +14,5 @@ - # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu=cypress - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g -Index: c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg,v -retrieving revision 1.2 -diff -u -r1.2 leon2.cfg ---- c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg 21 Oct 2009 10:56:51 -0000 1.2 -+++ c/src/lib/libbsp/sparc/leon2/make/custom/leon2.cfg 1 Dec 2009 22:25:24 -0000 -@@ -13,5 +13,5 @@ - # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu=cypress -msoft-float - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g -Index: c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg,v -retrieving revision 1.2 -diff -u -r1.2 leon3.cfg ---- c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg 21 Oct 2009 10:56:53 -0000 1.2 -+++ c/src/lib/libbsp/sparc/leon3/make/custom/leon3.cfg 1 Dec 2009 22:25:24 -0000 -@@ -13,5 +13,5 @@ - # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu=cypress -msoft-float - --# optimize flag: typically -O2 --CFLAGS_OPTIMIZE_V = -O2 -g -+# optimize flag: typically -Os -+CFLAGS_OPTIMIZE_V = -Os -g -Index: c/src/lib/libcpu/arm/pxa255/clock/clock.c -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/lib/libcpu/arm/pxa255/clock/clock.c,v -retrieving revision 1.5 -diff -u -r1.5 clock.c ---- c/src/lib/libcpu/arm/pxa255/clock/clock.c 6 Aug 2009 22:24:13 -0000 1.5 -+++ c/src/lib/libcpu/arm/pxa255/clock/clock.c 1 Dec 2009 22:25:24 -0000 -@@ -52,7 +52,7 @@ - XSCALE_OS_TIMER_IER |= 0x1; - - #if ON_SKYEYE==1 -- period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/100000; -+ period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/50000; - #else - period_num = (TIMER_RATE* Configuration.microseconds_per_tick)/10000; - #endif -Index: c/src/make/Makefile.inc.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/Makefile.inc.in,v -retrieving revision 1.11 -diff -u -r1.11 Makefile.inc.in ---- c/src/make/Makefile.inc.in 18 Sep 2007 17:55:35 -0000 1.11 -+++ c/src/make/Makefile.inc.in 1 Dec 2009 22:25:24 -0000 -@@ -40,6 +40,7 @@ - RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ - RTEMS_HAS_ITRON_API = @RTEMS_HAS_ITRON_API@ - RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ -+RTEMS_HAS_COVERAGE = @RTEMS_HAS_COVERAGE@ - - export RTEMS_BSP - export RTEMS_CUSTOM -Index: c/src/make/bsp.cfg.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/bsp.cfg.in,v -retrieving revision 1.6 -diff -u -r1.6 bsp.cfg.in ---- c/src/make/bsp.cfg.in 16 Oct 2009 14:33:55 -0000 1.6 -+++ c/src/make/bsp.cfg.in 1 Dec 2009 22:25:24 -0000 -@@ -26,6 +26,11 @@ - HAS_CPLUSPLUS = @HAS_CPLUSPLUS@ - - ## -+## Is this BSP being built to do coverage testing? -+## -+RTEMS_HAS_COVERAGE = @RTEMS_HAS_COVERAGE@ -+ -+## - ## Does this BSP support RTEMS's networking ? - ## - HAS_NETWORKING = @HAS_NETWORKING@ -Index: c/src/make/leaf.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/leaf.cfg,v -retrieving revision 1.11 -diff -u -r1.11 leaf.cfg ---- c/src/make/leaf.cfg 15 Apr 2009 08:31:09 -0000 1.11 -+++ c/src/make/leaf.cfg 1 Dec 2009 22:25:24 -0000 -@@ -41,8 +41,10 @@ - # Create a RTEMS executable based on MANAGERS which was set in - # app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -- $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -+ifneq ($(RTEMS_HAS_COVERAGE),yes) -+ MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -+ $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -+endif - - # Allow user to override link commands (to build a prom image, perhaps) - ifndef LINKCMDS -@@ -55,14 +57,18 @@ - - DOWNEXT=.ralf - -+ifeq ($(RTEMS_HAS_COVERAGE),yes) -+ COV_ARGS=$(PROJECT_RELEASE)/lib/rtems_coverage.o -+endif -+ - define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@)$(EXEEXT) $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@)$(EXEEXT) $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define default-bsp-post-link -Index: c/src/make/target.cfg.in -=================================================================== -RCS file: /usr1/CVS/rtems/c/src/make/target.cfg.in,v -retrieving revision 1.7 -diff -u -r1.7 target.cfg.in ---- c/src/make/target.cfg.in 4 Aug 2007 05:45:16 -0000 1.7 -+++ c/src/make/target.cfg.in 1 Dec 2009 22:25:24 -0000 -@@ -37,6 +37,7 @@ - RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@ - RTEMS_HAS_RDBG = no - RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ -+RTEMS_HAS_COVERAGE = @RTEMS_HAS_COVERAGE@ - RTEMS_CPU = @RTEMS_CPU@ - - XCFLAGS=$(CFLAGS_FOR_TARGET) -@@ -55,6 +56,7 @@ - # Create a RTEMS executable based on MANAGERS which was set in - # app's Makefile - --MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ -+ifneq ($(RTEMS_HAS_COVERAGE),yes) -+ MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS) \ - $(MANAGERS_REQUIRED), $(MANAGER_LIST)) -- -+endif -Index: c/src/make/aclocal/enable-coverage.m4 -=================================================================== -RCS file: c/src/make/aclocal/enable-coverage.m4 -diff -N c/src/make/aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ c/src/make/aclocal/enable-coverage.m4 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: cpukit/Makefile.am -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/Makefile.am,v -retrieving revision 1.93 -diff -u -r1.93 Makefile.am ---- cpukit/Makefile.am 22 Nov 2009 07:04:54 -0000 1.93 -+++ cpukit/Makefile.am 1 Dec 2009 22:25:24 -0000 -@@ -16,6 +16,9 @@ - SUBDIRS += libmd - SUBDIRS += libgnat - SUBDIRS += wrapup -+if ENABLE_COVERAGE -+SUBDIRS += wrapup-coverage -+endif - - SUBDIRS += zlib - -Index: cpukit/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/cpukit/configure.ac,v -retrieving revision 1.173 -diff -u -r1.173 configure.ac ---- cpukit/configure.ac 17 Nov 2009 17:33:40 -0000 1.173 -+++ cpukit/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -103,6 +103,7 @@ - RTEMS_CHECK_POSIX_API - RTEMS_CHECK_ITRON_API - RTEMS_CHECK_NETWORKING -+RTEMS_ENABLE_COVERAGE - - AS_IF([test x"${RTEMS_USE_NEWLIB}" = xyes], - [RTEMS_USES_TAR_H=yes], -@@ -144,6 +145,11 @@ - [1], - [if networking is enabled]) - -+RTEMS_CPUOPT([RTEMS_COVERAGE], -+ [test x"$RTEMS_HAS_COVERAGE" = xyes], -+ [1], -+ [to indicate this is a coverage build]) -+ - RTEMS_CPUOPT([RTEMS_USES_TAR_H], - [test x"${RTEMS_USES_TAR_H}" = x"yes"], - [1], -@@ -264,6 +270,10 @@ - test x"$ac_cv_type_uint8_t" = xyes \ - && test x"$ac_cv_type_uint16_t" = xyes]) - -+AM_CONDITIONAL(ENABLE_COVERAGE,test x"$RTEMS_HAS_COVERAGE" = x"yes") -+AM_CONDITIONAL(ENABLE_EXPERIMENTAL_COVERAGE, \ -+ test x"$RTEMS_HAS_EXPERIMENTAL_COVERAGE" = x"yes") -+ - AC_CONFIG_HEADER(config.h) - - ## These are needed by the NFS Client -@@ -317,7 +327,8 @@ - pppd/Makefile - shttpd/Makefile - mghttpd/Makefile --wrapup/Makefile]) -+wrapup/Makefile -+wrapup-coverage/Makefile]) - - AC_CONFIG_COMMANDS([preinstall-stamp], - [test -z "$with_multisubdir" && ${MAKE} preinstall-stamp], -Index: cpukit/aclocal/enable-coverage.m4 -=================================================================== -RCS file: cpukit/aclocal/enable-coverage.m4 -diff -N cpukit/aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/aclocal/enable-coverage.m4 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: cpukit/wrapup-coverage/.cvsignore -=================================================================== -RCS file: cpukit/wrapup-coverage/.cvsignore -diff -N cpukit/wrapup-coverage/.cvsignore ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/.cvsignore 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,2 @@ -+Makefile -+Makefile.in -Index: cpukit/wrapup-coverage/Makefile.am -=================================================================== -RCS file: cpukit/wrapup-coverage/Makefile.am -diff -N cpukit/wrapup-coverage/Makefile.am ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/Makefile.am 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,133 @@ -+## -+## $Id$ -+## -+ -+include $(top_srcdir)/automake/multilib.am -+include $(top_srcdir)/automake/compile.am -+ -+## Setup the variant build subdirectory -+ARCH = o-optimize -+ -+noinst_LIBRARIES = libcoverage.a -+project_lib_DATA = rtems_coverage.o -+libcoverage_a_SOURCES = -+ -+noinst_LIBRARIES += libsupp.a -+libsupp_a_SOURCES = start_coverage.c end_coverage.c -+ -+TMP_LIBS = -+# Only do coverage on portable code at this point -+#TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a -+TMP_LIBS += ../score/libscore.a -+TMP_LIBS += ../sapi/libsapi.a -+TMP_LIBS += ../rtems/librtems.a -+ -+if LIBPOSIX -+TMP_LIBS += ../posix/libposix.a -+endif -+ -+if LIBGNAT -+#TMP_LIBS += ../libgnat/libgnat.a -+endif -+ -+if LIBITRON -+## Deprecated do not do coverage on ITRON -+#TMP_LIBS += ../itron/libitron.a -+endif -+ -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libcsupport/libcsupport.a -+endif -+ -+# TMP_LIBS += ../libblock/libblock.a -+#if LIBDOSFS -+#TMP_LIBS += ../libfs/libdosfs.a -+#endif -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libfs/libimfs.a -+endif -+ -+#TMP_LIBS += ../libmisc/libmonitor.a -+## TODO: Coverage test libuntar -+#TMP_LIBS += ../libmisc/libuntar.a -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libmisc/libstackchk.a -+TMP_LIBS += ../libmisc/libcpuuse.a -+endif -+ -+#if LIBSHELL -+#TMP_LIBS += ../libmisc/libshell.a -+#endif -+ -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libmisc/libbspcmdline.a -+endif -+#TMP_LIBS += ../libmisc/libcapture.a -+if ENABLE_EXPERIMENTAL_COVERAGE -+TMP_LIBS += ../libmisc/libdumpbuf.a -+TMP_LIBS += ../libmisc/libdevnull.a -+endif -+ -+## Dummy is dummy configuration -- DO NOT INCLUDE IT IN COVERAGE -+#TMP_LIBS += ../libmisc/libdummy.a -+ -+#TMP_LIBS += ../libmisc/libfsmount.a -+#TMP_LIBS += ../libmisc/libmw-fb.a -+TMP_LIBS += ../libmisc/libstringto.a -+#TMP_LIBS += ../libmisc/libuuid.a -+ -+#TMP_LIBS += ../libi2c/libi2c.a -+ -+## Do not coverage test networking code -+#if LIBNETWORKING -+#TMP_LIBS += ../libnetworking/libnetworking.a -+#TMP_LIBS += ../libnetworking/libc.a -+#TMP_LIBS += ../libnetworking/lib.a -+#endif -+ -+#if LIBRPC -+#TMP_LIBS += ../librpc/librpc.a -+#TMP_LIBS += ../librpc/libxdr.a -+#endif -+ -+## TODO: Coverage test libmd -+#if NEWLIB -+#TMP_LIBS += ../libmd/libmd.a -+#endif -+ -+rtems_coverage.o: start_coverage.o end_coverage.o $(TMP_LIBS) -+ rm -f $@ -+ $(MKDIR_P) $(ARCH) -+ rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel -+ for f in $(TMP_LIBS); do \ -+ case $$f in \ -+ *.$(OBJEXT) | *.rel) \ -+ if test -f $(ARCH)/`basename $$f`; then \ -+ if cmp $$f $(ARCH)/`basename $$f`; then \ -+ true; \ -+ else \ -+ echo 1>&2 "ERROR -- `basename $$f` in multiple files"; \ -+ exit 1; \ -+ fi; \ -+ else \ -+ cp $$f $(ARCH)/; \ -+ chmod a-w $(ARCH)/`basename $$f`; \ -+ fi; \ -+ ;; \ -+ *.a) \ -+ cd $(ARCH); \ -+ $(AR) xv ../$$f || exit 1; \ -+ chmod a-w * ; \ -+ cd ..; \ -+ ;; \ -+ esac; \ -+ done -+ ls $(ARCH)/* > $@-list -+ $(AR:ar=ld) -r -o $@ start_coverage.o @$@-list end_coverage.o -+ rm -f $@-list $(1)/*.$(OBJEXT) $(1)/*.rel -+ rm -rf $(1) -+ -+all-local: $(TMPINSTALL_FILES) -+ -+include $(srcdir)/preinstall.am -+include $(top_srcdir)/automake/local.am -Index: cpukit/wrapup-coverage/end_coverage.c -=================================================================== -RCS file: cpukit/wrapup-coverage/end_coverage.c -diff -N cpukit/wrapup-coverage/end_coverage.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/end_coverage.c 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,2 @@ -+void end_coverage(void){} -+ -Index: cpukit/wrapup-coverage/preinstall.am -=================================================================== -RCS file: cpukit/wrapup-coverage/preinstall.am -diff -N cpukit/wrapup-coverage/preinstall.am ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/preinstall.am 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,24 @@ -+## Automatically generated by ampolish3 - Do not edit -+ -+if AMPOLISH3 -+$(srcdir)/preinstall.am: Makefile.am -+ $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -+endif -+ -+PREINSTALL_DIRS = -+DISTCLEANFILES = $(PREINSTALL_DIRS) -+ -+all-local: $(TMPINSTALL_FILES) -+ -+TMPINSTALL_FILES = -+CLEANFILES = $(TMPINSTALL_FILES) -+ -+$(PROJECT_LIB)/$(dirstamp): -+ @$(MKDIR_P) $(PROJECT_LIB) -+ @: > $(PROJECT_LIB)/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) -+ -+$(PROJECT_LIB)/rtems_coverage.o: rtems_coverage.o $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_coverage.o -+TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_coverage.o -+ -Index: cpukit/wrapup-coverage/start_coverage.c -=================================================================== -RCS file: cpukit/wrapup-coverage/start_coverage.c -diff -N cpukit/wrapup-coverage/start_coverage.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ cpukit/wrapup-coverage/start_coverage.c 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1 @@ -+void start_coverage(void){} -Index: make/leaf.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/leaf.cfg,v -retrieving revision 1.24 -diff -u -r1.24 leaf.cfg ---- make/leaf.cfg 15 Sep 2008 17:43:22 -0000 1.24 -+++ make/leaf.cfg 1 Dec 2009 22:25:24 -0000 -@@ -116,14 +116,18 @@ - - DOWNEXT=.ralf - -+ifeq ($(RTEMS_HAS_COVERAGE),yes) -+ COV_ARGS=$(PROJECT_RELEASE)/lib/rtems_coverage.o -+endif -+ - define bsp-link-c - $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@).exe $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -- -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) -+ -o $(basename $@).exe $(COV_ARGS) $(LINK_OBJS) $(LINK_LIBS) - endef - - define default-bsp-post-link -Index: make/compilers/gcc-no_bsp.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/compilers/gcc-no_bsp.cfg,v -retrieving revision 1.14 -diff -u -r1.14 gcc-no_bsp.cfg ---- make/compilers/gcc-no_bsp.cfg 18 Sep 2008 17:33:55 -0000 1.14 -+++ make/compilers/gcc-no_bsp.cfg 1 Dec 2009 22:25:24 -0000 -@@ -201,8 +201,10 @@ - - # Create a RTEMS executable based on MANAGERS which was set in app's Makefile - -+ifneq ($(RTEMS_HAS_COVERAGE),yes) - MANAGERS_NOT_WANTED=$(filter-out $(MANAGERS), $(MANAGER_LIST)) - MANAGERS_NOT_WANTED:=$(filter-out $(MANAGERS_REQUIRED), $(MANAGERS_NOT_WANTED)) -+endif - - CONSTRUCTOR= - -Index: make/compilers/gcc-target-default.cfg -=================================================================== -RCS file: /usr1/CVS/rtems/make/compilers/gcc-target-default.cfg,v -retrieving revision 1.40 -diff -u -r1.40 gcc-target-default.cfg ---- make/compilers/gcc-target-default.cfg 18 Sep 2008 17:33:55 -0000 1.40 -+++ make/compilers/gcc-target-default.cfg 1 Dec 2009 22:25:24 -0000 -@@ -192,3 +192,9 @@ - $(LINK.c) $(CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ - -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^ - endef -+ -+ifeq ($(RTEMS_HAS_COVERAGE),yes) -+ CFLAGS_OPTIMIZE_V = -Os -g -+else -+ CFLAGS_OPTIMIZE_V = -O2 -g -+endif -Index: testsuites/aclocal/enable-coverage.m4 -=================================================================== -RCS file: testsuites/aclocal/enable-coverage.m4 -diff -N testsuites/aclocal/enable-coverage.m4 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuites/aclocal/enable-coverage.m4 1 Dec 2009 22:25:24 -0000 -@@ -0,0 +1,15 @@ -+dnl $Id$ -+ -+AC_DEFUN([RTEMS_ENABLE_COVERAGE], -+[ -+AC_ARG_ENABLE(coverage, -+[AS_HELP_STRING([--enable-coverage], -+[enable building for coverage testing])], -+[case "${enable_coverage}" in -+ yes) RTEMS_HAS_COVERAGE=yes ;; -+ exp*) RTEMS_HAS_COVERAGE=yes ; RTEMS_HAS_EXPERIMENTAL_COVERAGE=yes ;; -+ no) RTEMS_HAS_COVERAGE=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for enable-coverage option) ;; -+esac], [RTEMS_HAS_COVERAGE=no]) -+AC_SUBST(RTEMS_HAS_COVERAGE) -+]) -Index: testsuites/itrontests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/itrontests/configure.ac,v -retrieving revision 1.20 -diff -u -r1.20 configure.ac ---- testsuites/itrontests/configure.ac 20 Oct 2009 04:10:55 -0000 1.20 -+++ testsuites/itrontests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -12,7 +12,6 @@ - AM_INIT_AUTOMAKE([no-define foreign 1.10]) - AM_MAINTAINER_MODE - -- - RTEMS_ENV_RTEMSBSP - - RTEMS_PROJECT_ROOT -@@ -23,6 +22,8 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) - - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile -Index: testsuites/libtests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/libtests/configure.ac,v -retrieving revision 1.30 -diff -u -r1.30 configure.ac ---- testsuites/libtests/configure.ac 1 Dec 2009 22:10:33 -0000 1.30 -+++ testsuites/libtests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -28,9 +28,11 @@ - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - RTEMS_CHECK_CXX(RTEMS_BSP) - -- - AM_CONDITIONAL(HAS_CXX,test "$rtems_cv_HAS_CPLUSPLUS" = "yes") - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - block01/Makefile -Index: testsuites/mptests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/mptests/configure.ac,v -retrieving revision 1.22 -diff -u -r1.22 configure.ac ---- testsuites/mptests/configure.ac 20 Oct 2009 04:12:53 -0000 1.22 -+++ testsuites/mptests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -31,6 +31,9 @@ - AC_ARG_VAR([MAX_LONG_TEST_DURATION], - [The longest length of time a "long running" test should run]) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - mp01/Makefile -Index: testsuites/psxtests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/psxtests/configure.ac,v -retrieving revision 1.59 -diff -u -r1.59 configure.ac ---- testsuites/psxtests/configure.ac 12 Nov 2009 00:21:51 -0000 1.59 -+++ testsuites/psxtests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -24,6 +24,9 @@ - - AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"]) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API]) - AM_CONDITIONAL(HAS_POSIX,test x"${rtems_cv_RTEMS_POSIX_API}" = x"yes") - -Index: testsuites/samples/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/samples/configure.ac,v -retrieving revision 1.29 -diff -u -r1.29 configure.ac ---- testsuites/samples/configure.ac 17 Aug 2007 01:07:10 -0000 1.29 -+++ testsuites/samples/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -58,6 +58,9 @@ - #FIXME: We should use a feature based check - AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"]) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - base_sp/Makefile -Index: testsuites/sptests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/sptests/configure.ac,v -retrieving revision 1.86 -diff -u -r1.86 configure.ac ---- testsuites/sptests/configure.ac 30 Nov 2009 09:08:35 -0000 1.86 -+++ testsuites/sptests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -23,6 +23,9 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - # Explicitly list all Makefiles here - AC_CONFIG_FILES([Makefile - sp01/Makefile -Index: testsuites/tmitrontests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/tmitrontests/configure.ac,v -retrieving revision 1.21 -diff -u -r1.21 configure.ac ---- testsuites/tmitrontests/configure.ac 20 Oct 2009 04:14:24 -0000 1.21 -+++ testsuites/tmitrontests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -23,6 +23,9 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - - OPERATION_COUNT=${OPERATION_COUNT-100} - AC_SUBST(OPERATION_COUNT) -Index: testsuites/tmtests/configure.ac -=================================================================== -RCS file: /usr1/CVS/rtems/testsuites/tmtests/configure.ac,v -retrieving revision 1.21 -diff -u -r1.21 configure.ac ---- testsuites/tmtests/configure.ac 20 Oct 2009 04:14:56 -0000 1.21 -+++ testsuites/tmtests/configure.ac 1 Dec 2009 22:25:24 -0000 -@@ -24,6 +24,9 @@ - - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -+RTEMS_ENABLE_COVERAGE -+AM_CONDITIONAL([HAS_COVERAGE],[test $RTEMS_HAS_COVERAGE = "yes"]) -+ - - OPERATION_COUNT=${OPERATION_COUNT-100} - AC_SUBST(OPERATION_COUNT) |