From c33c3532754e33676207f8d43d3eec171c0e0405 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 8 Jul 2010 19:39:14 +0000 Subject: 2010-07-08 Joel Sherrill * Makefile.am, configure.ac: Readd spfatal09 as a malloc initialization fatal error. * spfatal09/.cvsignore, spfatal09/Makefile.am, spfatal09/spfatal09.doc, spfatal09/spfatal09.scn, spfatal09/testcase.h: New files. --- testsuites/sptests/ChangeLog | 7 +++++++ testsuites/sptests/Makefile.am | 2 +- testsuites/sptests/configure.ac | 1 + testsuites/sptests/spfatal09/.cvsignore | 2 ++ testsuites/sptests/spfatal09/Makefile.am | 25 +++++++++++++++++++++++++ testsuites/sptests/spfatal09/spfatal09.doc | 22 ++++++++++++++++++++++ testsuites/sptests/spfatal09/spfatal09.scn | 4 ++++ testsuites/sptests/spfatal09/testcase.h | 30 ++++++++++++++++++++++++++++++ 8 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 testsuites/sptests/spfatal09/.cvsignore create mode 100644 testsuites/sptests/spfatal09/Makefile.am create mode 100644 testsuites/sptests/spfatal09/spfatal09.doc create mode 100644 testsuites/sptests/spfatal09/spfatal09.scn create mode 100644 testsuites/sptests/spfatal09/testcase.h diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 5819626431..d330f4e566 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,10 @@ +2010-07-08 Joel Sherrill + + * Makefile.am, configure.ac: Readd spfatal09 as a malloc initialization + fatal error. + * spfatal09/.cvsignore, spfatal09/Makefile.am, spfatal09/spfatal09.doc, + spfatal09/spfatal09.scn, spfatal09/testcase.h: New files. + 2010-07-07 Bharath Suri PR 1603/testing diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index cb3b5fae94..80dc4956bb 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = \ spwatchdog spwkspace \ sperror01 sperror02 sperror03 \ spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \ - spfatal08 spfatal10 spfatal11 spfatal12 spfatal13 spfatal14 \ + spfatal08 spfatal09 spfatal10 spfatal11 spfatal12 spfatal13 spfatal14 \ spfatal15 spfatal16 spfatal17 spfatal18 spfatal19 spfatal20 \ spfifo01 spfifo02 spfifo03 spfifo04 spfifo05 \ spintrcritical01 spintrcritical02 spintrcritical03 spintrcritical04 \ diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 7f6ffdcfa1..d4e25a0d3c 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -112,6 +112,7 @@ spfatal05/Makefile spfatal06/Makefile spfatal07/Makefile spfatal08/Makefile +spfatal09/Makefile spfatal10/Makefile spfatal11/Makefile spfatal12/Makefile diff --git a/testsuites/sptests/spfatal09/.cvsignore b/testsuites/sptests/spfatal09/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/spfatal09/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/spfatal09/Makefile.am b/testsuites/sptests/spfatal09/Makefile.am new file mode 100644 index 0000000000..4d2df9285b --- /dev/null +++ b/testsuites/sptests/spfatal09/Makefile.am @@ -0,0 +1,25 @@ +## +## $Id$ +## + +rtems_tests_PROGRAMS = spfatal09 +spfatal09_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h \ + testcase.h + +dist_rtems_tests_DATA = spfatal09.scn +dist_rtems_tests_DATA += spfatal09.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(spfatal09_OBJECTS) $(spfatal09_LDADD) +LINK_LIBS = $(spfatal09_LDLIBS) + +spfatal09$(EXEEXT): $(spfatal09_OBJECTS) $(spfatal09_DEPENDENCIES) + @rm -f spfatal09$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spfatal09/spfatal09.doc b/testsuites/sptests/spfatal09/spfatal09.doc new file mode 100644 index 0000000000..318611895e --- /dev/null +++ b/testsuites/sptests/spfatal09/spfatal09.doc @@ -0,0 +1,22 @@ +# +# $Id$ +# +# COPYRIGHT (c) 1989-2010. +# On-Line Applications Research Corporation (OAR). +# +# The license and distribution terms for this file may be +# found in the file LICENSE in this distribution or at +# http://www.rtems.com/license/LICENSE. +# + +This file describes the directives and concepts tested by this test set. + +test set name: spfatal09 + +directives: + + RTEMS_Malloc_Initialize + +concepts: + ++ fatal error for heap initialization failing diff --git a/testsuites/sptests/spfatal09/spfatal09.scn b/testsuites/sptests/spfatal09/spfatal09.scn new file mode 100644 index 0000000000..4ab109adc3 --- /dev/null +++ b/testsuites/sptests/spfatal09/spfatal09.scn @@ -0,0 +1,4 @@ +*** TEST FATAL 9 *** +Fatal error (Bad heap address to malloc) hit +*** END OF TEST *** + diff --git a/testsuites/sptests/spfatal09/testcase.h b/testsuites/sptests/spfatal09/testcase.h new file mode 100644 index 0000000000..ee87c1e729 --- /dev/null +++ b/testsuites/sptests/spfatal09/testcase.h @@ -0,0 +1,30 @@ +/* + * Malloc Initialization Error + * + * COPYRIGHT (c) 1989-2010. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#include +#include + +#define FATAL_ERROR_TEST_NAME "9" +#define FATAL_ERROR_DESCRIPTION "Bad heap address to malloc" +#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API +#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE +#define FATAL_ERROR_EXPECTED_ERROR RTEMS_NO_MEMORY + +char Malloc_Heap[ 1 ] CPU_STRUCTURE_ALIGNMENT; + +void force_error() +{ + RTEMS_Malloc_Initialize( Malloc_Heap, sizeof(Malloc_Heap), 0 ); + + /* we will not run this far */ +} -- cgit v1.2.3