From ab59de4542cd9ee505b573c809234287edb1f7a9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 23 Jun 2010 23:24:11 +0000 Subject: 2010-06-23 Joel Sherrill * block01/Makefile.am, block02/Makefile.am, block03/Makefile.am, block04/Makefile.am, block05/Makefile.am, block06/Makefile.am, block07/Makefile.am, block08/Makefile.am, block09/Makefile.am, block10/Makefile.am, bspcmdline01/Makefile.am, cpuuse/Makefile.am, heapwalk/Makefile.am, malloctest/Makefile.am, monitor/Makefile.am, monitor02/Makefile.am, putenvtest/Makefile.am, rtems++/Makefile.am, rtmonuse/Makefile.am, stackchk/Makefile.am, stackchk01/Makefile.am, stringto01/Makefile.am, termios/Makefile.am, termios01/Makefile.am, termios01/init.c, termios02/Makefile.am: Fix bug so existing test code for rtems_termios_baud_to_index() is executed. --- testsuites/libtests/ChangeLog | 13 +++++++++++++ testsuites/libtests/block01/Makefile.am | 1 - testsuites/libtests/block02/Makefile.am | 1 - testsuites/libtests/block03/Makefile.am | 1 - testsuites/libtests/block04/Makefile.am | 1 - testsuites/libtests/block05/Makefile.am | 1 - testsuites/libtests/block06/Makefile.am | 1 - testsuites/libtests/block07/Makefile.am | 1 - testsuites/libtests/block08/Makefile.am | 1 - testsuites/libtests/block09/Makefile.am | 1 - testsuites/libtests/block10/Makefile.am | 1 - testsuites/libtests/bspcmdline01/Makefile.am | 1 - testsuites/libtests/cpuuse/Makefile.am | 1 - testsuites/libtests/heapwalk/Makefile.am | 1 - testsuites/libtests/malloctest/Makefile.am | 1 - testsuites/libtests/monitor/Makefile.am | 1 - testsuites/libtests/monitor02/Makefile.am | 1 - testsuites/libtests/putenvtest/Makefile.am | 1 - testsuites/libtests/rtems++/Makefile.am | 1 - testsuites/libtests/rtmonuse/Makefile.am | 1 - testsuites/libtests/stackchk/Makefile.am | 1 - testsuites/libtests/stackchk01/Makefile.am | 1 - testsuites/libtests/stringto01/Makefile.am | 1 - testsuites/libtests/termios/Makefile.am | 1 - testsuites/libtests/termios01/Makefile.am | 1 - testsuites/libtests/termios01/init.c | 21 ++++++++++----------- testsuites/libtests/termios02/Makefile.am | 1 - 27 files changed, 23 insertions(+), 36 deletions(-) (limited to 'testsuites/libtests') diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 7f0d49a68a..9d570aab81 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,16 @@ +2010-06-23 Joel Sherrill + + * block01/Makefile.am, block02/Makefile.am, block03/Makefile.am, + block04/Makefile.am, block05/Makefile.am, block06/Makefile.am, + block07/Makefile.am, block08/Makefile.am, block09/Makefile.am, + block10/Makefile.am, bspcmdline01/Makefile.am, cpuuse/Makefile.am, + heapwalk/Makefile.am, malloctest/Makefile.am, monitor/Makefile.am, + monitor02/Makefile.am, putenvtest/Makefile.am, rtems++/Makefile.am, + rtmonuse/Makefile.am, stackchk/Makefile.am, stackchk01/Makefile.am, + stringto01/Makefile.am, termios/Makefile.am, termios01/Makefile.am, + termios01/init.c, termios02/Makefile.am: Fix bug so existing test + code for rtems_termios_baud_to_index() is executed. + 2010-06-22 Joel Sherrill * stackchk/blow.c, stackchk/stackchk.scn: Print a stack check report diff --git a/testsuites/libtests/block01/Makefile.am b/testsuites/libtests/block01/Makefile.am index 653969a26d..b559209524 100644 --- a/testsuites/libtests/block01/Makefile.am +++ b/testsuites/libtests/block01/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block02/Makefile.am b/testsuites/libtests/block02/Makefile.am index e873b19c80..e03e5cd34d 100644 --- a/testsuites/libtests/block02/Makefile.am +++ b/testsuites/libtests/block02/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block03/Makefile.am b/testsuites/libtests/block03/Makefile.am index 4167201923..303500cd14 100644 --- a/testsuites/libtests/block03/Makefile.am +++ b/testsuites/libtests/block03/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block04/Makefile.am b/testsuites/libtests/block04/Makefile.am index 205070cd9b..48ceee6ccb 100644 --- a/testsuites/libtests/block04/Makefile.am +++ b/testsuites/libtests/block04/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block05/Makefile.am b/testsuites/libtests/block05/Makefile.am index 01c6247142..75273c9dfb 100644 --- a/testsuites/libtests/block05/Makefile.am +++ b/testsuites/libtests/block05/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block05_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block06/Makefile.am b/testsuites/libtests/block06/Makefile.am index a8146d4cc3..9c2efbafa1 100644 --- a/testsuites/libtests/block06/Makefile.am +++ b/testsuites/libtests/block06/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block06_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block07/Makefile.am b/testsuites/libtests/block07/Makefile.am index bf111af7ff..0a81c35d02 100644 --- a/testsuites/libtests/block07/Makefile.am +++ b/testsuites/libtests/block07/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block07_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block08/Makefile.am b/testsuites/libtests/block08/Makefile.am index 802c14f594..0899540088 100644 --- a/testsuites/libtests/block08/Makefile.am +++ b/testsuites/libtests/block08/Makefile.am @@ -36,7 +36,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block09/Makefile.am b/testsuites/libtests/block09/Makefile.am index a59029463e..20c443ab9b 100644 --- a/testsuites/libtests/block09/Makefile.am +++ b/testsuites/libtests/block09/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/block10/Makefile.am b/testsuites/libtests/block10/Makefile.am index 2df0bb48c5..de555ed305 100644 --- a/testsuites/libtests/block10/Makefile.am +++ b/testsuites/libtests/block10/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -block10_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/bspcmdline01/Makefile.am b/testsuites/libtests/bspcmdline01/Makefile.am index ba7d16ffd3..06629035b6 100644 --- a/testsuites/libtests/bspcmdline01/Makefile.am +++ b/testsuites/libtests/bspcmdline01/Makefile.am @@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -bspcmdline01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am index 0b31a92d46..e184e1e2cd 100644 --- a/testsuites/libtests/cpuuse/Makefile.am +++ b/testsuites/libtests/cpuuse/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -cpuuse_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/heapwalk/Makefile.am b/testsuites/libtests/heapwalk/Makefile.am index 46b972da00..b4e742f13b 100644 --- a/testsuites/libtests/heapwalk/Makefile.am +++ b/testsuites/libtests/heapwalk/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -heapwalk_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am index 673dac457e..ae5c462fbd 100644 --- a/testsuites/libtests/malloctest/Makefile.am +++ b/testsuites/libtests/malloctest/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -malloctest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am index 202c337684..a1f0753922 100644 --- a/testsuites/libtests/monitor/Makefile.am +++ b/testsuites/libtests/monitor/Makefile.am @@ -12,7 +12,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -monitor_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/monitor02/Makefile.am b/testsuites/libtests/monitor02/Makefile.am index 2792026063..aa5ae4f5fe 100644 --- a/testsuites/libtests/monitor02/Makefile.am +++ b/testsuites/libtests/monitor02/Makefile.am @@ -12,7 +12,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -monitor02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am index 87d0849699..41101cb94a 100644 --- a/testsuites/libtests/putenvtest/Makefile.am +++ b/testsuites/libtests/putenvtest/Makefile.am @@ -11,7 +11,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -putenvtest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am index d618ab862d..9a1209fb60 100644 --- a/testsuites/libtests/rtems++/Makefile.am +++ b/testsuites/libtests/rtems++/Makefile.am @@ -20,7 +20,6 @@ if HAS_CXX rtems___LDLIBS = -lrtems++ AM_CPPFLAGS += -I$(top_srcdir)/../support/include -rtems___LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) LINK_OBJS = $(rtems___OBJECTS) $(rtems___LDADD) LINK_LIBS = $(rtems___LDLIBS) diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am index 14a730fab5..d2522b653d 100644 --- a/testsuites/libtests/rtmonuse/Makefile.am +++ b/testsuites/libtests/rtmonuse/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -rtmonuse_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am index ee2b19af47..07a983f3b1 100644 --- a/testsuites/libtests/stackchk/Makefile.am +++ b/testsuites/libtests/stackchk/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -stackchk_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/stackchk01/Makefile.am b/testsuites/libtests/stackchk01/Makefile.am index dea58a1afe..5adc9cb249 100644 --- a/testsuites/libtests/stackchk01/Makefile.am +++ b/testsuites/libtests/stackchk01/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -stackchk01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/stringto01/Makefile.am b/testsuites/libtests/stringto01/Makefile.am index 621e84080e..a297fedcdf 100644 --- a/testsuites/libtests/stringto01/Makefile.am +++ b/testsuites/libtests/stringto01/Makefile.am @@ -13,7 +13,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -stringto01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am index c53fc9347a..9d746611c8 100644 --- a/testsuites/libtests/termios/Makefile.am +++ b/testsuites/libtests/termios/Makefile.am @@ -11,7 +11,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -termios_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/termios01/Makefile.am b/testsuites/libtests/termios01/Makefile.am index 3d4d5156c4..f10b3f5054 100644 --- a/testsuites/libtests/termios01/Makefile.am +++ b/testsuites/libtests/termios01/Makefile.am @@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -termios01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/../support/include diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c index 206d676b51..c73e5f3bf8 100644 --- a/testsuites/libtests/termios01/init.c +++ b/testsuites/libtests/termios01/init.c @@ -134,18 +134,17 @@ void test_termios_baud2index(void) i = rtems_termios_baud_to_index( -2 ); rtems_test_assert( i == -1 ); - if ( i != -1 ) - for (i=0 ; baud_table[i].constant != -1 ; i++ ) { - printf( - "termios_baud_to_index(B%" PRIdrtems_termios_baud_t ") - OK\n", - baud_table[i].baud - ); - index = rtems_termios_baud_to_index( baud_table[i].constant ); - if ( index != i ) { - printf( "ERROR - returned %d should be %d\n", index, i ); - rtems_test_exit(0); - } + for (i=0 ; baud_table[i].constant != -1 ; i++ ) { + printf( + "termios_baud_to_index(B%" PRIdrtems_termios_baud_t ") - OK\n", + baud_table[i].baud + ); + index = rtems_termios_baud_to_index( baud_table[i].constant ); + if ( index != i ) { + printf( "ERROR - returned %d should be %d\n", index, i ); + rtems_test_exit(0); } + } } /* diff --git a/testsuites/libtests/termios02/Makefile.am b/testsuites/libtests/termios02/Makefile.am index 389904bc0f..90085c2046 100644 --- a/testsuites/libtests/termios02/Makefile.am +++ b/testsuites/libtests/termios02/Makefile.am @@ -14,7 +14,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -termios02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/../support/include -- cgit v1.2.3