summaryrefslogtreecommitdiffstats
path: root/testsuites/libtests
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-11-11 20:08:46 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-11-12 09:47:20 +0100
commit1a48cbfa16bf54a442f9394e4c4d9c2211e82865 (patch)
tree929eba7ba5e91ae9ae31f77547353dbb04ea5da4 /testsuites/libtests
parenttests: Simplify fatal error test support (diff)
downloadrtems-1a48cbfa16bf54a442f9394e4c4d9c2211e82865.tar.bz2
sptests: Avoid include path magic
Update #3818.
Diffstat (limited to 'testsuites/libtests')
-rw-r--r--testsuites/libtests/Makefile.am6
-rw-r--r--testsuites/libtests/devnullfatal01/init.c (renamed from testsuites/libtests/devnullfatal01/testcase.h)10
2 files changed, 11 insertions, 5 deletions
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index a9af43e1c9..b7a102dc7f 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -313,11 +313,9 @@ if TEST_devnullfatal01
lib_tests += devnullfatal01
lib_screens += devnullfatal01/devnullfatal01.scn
lib_docs += devnullfatal01/devnullfatal01.doc
-devnullfatal01_SOURCES = ../sptests/spfatal_support/init.c \
- devnullfatal01/testcase.h
+devnullfatal01_SOURCES = devnullfatal01/init.c
devnullfatal01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_devnullfatal01) \
- $(support_includes) -I$(top_srcdir)/../../sptests/spfatal_support \
- -I$(top_srcdir)/devnullfatal01
+ $(support_includes)
endif
if DLTESTS
diff --git a/testsuites/libtests/devnullfatal01/testcase.h b/testsuites/libtests/devnullfatal01/init.c
index b97b7d0a58..ecf63cfe51 100644
--- a/testsuites/libtests/devnullfatal01/testcase.h
+++ b/testsuites/libtests/devnullfatal01/init.c
@@ -1,3 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "../../sptests/spfatal_support/spfatal.h"
+
/*
* COPYRIGHT (c) 1989-2010, 2017.
* On-Line Applications Research Corporation (OAR).
@@ -15,7 +21,7 @@
#include <rtems/devnull.h>
#include "tmacros.h"
-void force_error()
+static void force_error(void)
{
int status;
@@ -27,3 +33,5 @@ void force_error()
/* A fatal error would be raised in previous call */
/* we will not run this far */
}
+
+#include "../../sptests/spfatal_support/spfatalimpl.h"