From 8e8775dbad83061cb903c9bf19fcdb174bdd2c9c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 27 Jul 2010 13:57:17 +0000 Subject: 2010-07-27 Joel Sherrill PR 1632/testing * Makefile.am, configure.ac: Make dedicated fatal error test for /dev/null already registered. Using code from Bharath in new test framework. * devnullfatal01/.cvsignore, devnullfatal01/Makefile.am, devnullfatal01/devnullfatal01.doc, devnullfatal01/devnullfatal01.scn, devnullfatal01/testcase.h: New files. --- testsuites/libtests/ChangeLog | 10 +++++++ testsuites/libtests/Makefile.am | 3 ++- testsuites/libtests/configure.ac | 1 + testsuites/libtests/devnullfatal01/.cvsignore | 2 ++ testsuites/libtests/devnullfatal01/Makefile.am | 29 ++++++++++++++++++++ .../libtests/devnullfatal01/devnullfatal01.doc | 23 ++++++++++++++++ .../libtests/devnullfatal01/devnullfatal01.scn | 3 +++ testsuites/libtests/devnullfatal01/testcase.h | 31 ++++++++++++++++++++++ 8 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 testsuites/libtests/devnullfatal01/.cvsignore create mode 100644 testsuites/libtests/devnullfatal01/Makefile.am create mode 100644 testsuites/libtests/devnullfatal01/devnullfatal01.doc create mode 100644 testsuites/libtests/devnullfatal01/devnullfatal01.scn create mode 100644 testsuites/libtests/devnullfatal01/testcase.h (limited to 'testsuites/libtests') diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index e910f8a2bc..4099218aaf 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,13 @@ +2010-07-27 Joel Sherrill + + PR 1632/testing + * Makefile.am, configure.ac: Make dedicated fatal error test for + /dev/null already registered. Using code from Bharath in new test + framework. + * devnullfatal01/.cvsignore, devnullfatal01/Makefile.am, + devnullfatal01/devnullfatal01.doc, devnullfatal01/devnullfatal01.scn, + devnullfatal01/testcase.h: New files. + 2010-07-27 Bharath Suri PR 1632/testing diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am index d049c46f70..f1f5fa5bda 100644 --- a/testsuites/libtests/Makefile.am +++ b/testsuites/libtests/Makefile.am @@ -6,7 +6,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = POSIX -SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 gxx01 \ +SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \ + devnullfatal01 gxx01 \ malloctest malloc02 malloc03 malloc04 malloc05 heapwalk \ putenvtest monitor monitor02 rtmonuse stackchk stackchk01 \ termios termios01 termios02 termios03 termios04 termios05 \ diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index 5e21f17a1e..ff3b9cff5a 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -49,6 +49,7 @@ devfs01/Makefile devfs02/Makefile devfs03/Makefile devfs04/Makefile +devnullfatal01/Makefile gxx01/Makefile heapwalk/Makefile malloctest/Makefile diff --git a/testsuites/libtests/devnullfatal01/.cvsignore b/testsuites/libtests/devnullfatal01/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/libtests/devnullfatal01/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/libtests/devnullfatal01/Makefile.am b/testsuites/libtests/devnullfatal01/Makefile.am new file mode 100644 index 0000000000..9615015672 --- /dev/null +++ b/testsuites/libtests/devnullfatal01/Makefile.am @@ -0,0 +1,29 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = devnullfatal01 +devnullfatal01_SOURCES = ../../sptests/spfatal_support/init.c \ + ../../sptests/spfatal_support/system.h testcase.h + +dist_rtems_tests_DATA = devnullfatal01.scn +dist_rtems_tests_DATA += devnullfatal01.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 +AM_CPPFLAGS += -I$(top_srcdir)/../../sptests/spfatal_support + +LINK_OBJS = $(devnullfatal01_OBJECTS) $(devnullfatal01_LDADD) +LINK_LIBS = $(devnullfatal01_LDLIBS) + +devnullfatal01$(EXEEXT): $(devnullfatal01_OBJECTS) \ + $(devnullfatal01_DEPENDENCIES) + @rm -f devnullfatal01$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/libtests/devnullfatal01/devnullfatal01.doc b/testsuites/libtests/devnullfatal01/devnullfatal01.doc new file mode 100644 index 0000000000..697af45ffe --- /dev/null +++ b/testsuites/libtests/devnullfatal01/devnullfatal01.doc @@ -0,0 +1,23 @@ +# +# $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: devnullfatal01 + +directives: + + rtems_io_register_name + null_initialize + +concepts: + ++ Exercise fatal error when /dev/null has already been registered. diff --git a/testsuites/libtests/devnullfatal01/devnullfatal01.scn b/testsuites/libtests/devnullfatal01/devnullfatal01.scn new file mode 100644 index 0000000000..68111994a9 --- /dev/null +++ b/testsuites/libtests/devnullfatal01/devnullfatal01.scn @@ -0,0 +1,3 @@ +*** TEST FATAL /DEV/NULL FATAL 01 *** +Fatal error (/dev/null already registered) hit +*** END OF TEST *** diff --git a/testsuites/libtests/devnullfatal01/testcase.h b/testsuites/libtests/devnullfatal01/testcase.h new file mode 100644 index 0000000000..9ebf0344f7 --- /dev/null +++ b/testsuites/libtests/devnullfatal01/testcase.h @@ -0,0 +1,31 @@ +/* + * 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$ + */ + +#define FATAL_ERROR_TEST_NAME "/DEV/NULL FATAL 01" +#define FATAL_ERROR_DESCRIPTION "/dev/null already registered" +#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API +#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE +#define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY + +#include + +void force_error() +{ + int status; + + status = rtems_io_register_name( "/dev/null", 0, 0 ); + + status = null_initialize( 0, 0, NULL ); + + /* A fatal error would be raised in previous call */ + /* we will not run this far */ +} + -- cgit v1.2.3