From 1a48cbfa16bf54a442f9394e4c4d9c2211e82865 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 11 Nov 2019 20:08:46 +0100
Subject: sptests: Avoid include path magic

Update #3818.
---
 testsuites/libtests/devnullfatal01/init.c     | 37 +++++++++++++++++++++++++++
 testsuites/libtests/devnullfatal01/testcase.h | 29 ---------------------
 2 files changed, 37 insertions(+), 29 deletions(-)
 create mode 100644 testsuites/libtests/devnullfatal01/init.c
 delete mode 100644 testsuites/libtests/devnullfatal01/testcase.h

(limited to 'testsuites/libtests/devnullfatal01')

diff --git a/testsuites/libtests/devnullfatal01/init.c b/testsuites/libtests/devnullfatal01/init.c
new file mode 100644
index 0000000000..ecf63cfe51
--- /dev/null
+++ b/testsuites/libtests/devnullfatal01/init.c
@@ -0,0 +1,37 @@
+#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).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.org/license/LICENSE.
+ */
+
+#define FATAL_ERROR_TEST_NAME            "/DEV/NULL 1"
+#define FATAL_ERROR_DESCRIPTION          "/dev/null already registered"
+#define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
+#define FATAL_ERROR_EXPECTED_ERROR       RTEMS_TOO_MANY
+
+#include <rtems/devnull.h>
+#include "tmacros.h"
+
+static void force_error(void)
+{
+  int status;
+
+  status = rtems_io_register_name( "/dev/null", 0, 0 );
+  directive_failed( status, "io register" );
+
+  status = null_initialize( 0, 0, NULL );
+
+  /* A fatal error would be raised in previous call */
+  /* we will not run this far */
+}
+
+#include "../../sptests/spfatal_support/spfatalimpl.h"
diff --git a/testsuites/libtests/devnullfatal01/testcase.h b/testsuites/libtests/devnullfatal01/testcase.h
deleted file mode 100644
index b97b7d0a58..0000000000
--- a/testsuites/libtests/devnullfatal01/testcase.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-2010, 2017.
- *  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.org/license/LICENSE.
- */
-
-#define FATAL_ERROR_TEST_NAME            "/DEV/NULL 1"
-#define FATAL_ERROR_DESCRIPTION          "/dev/null already registered"
-#define FATAL_ERROR_EXPECTED_SOURCE      INTERNAL_ERROR_RTEMS_API
-#define FATAL_ERROR_EXPECTED_ERROR       RTEMS_TOO_MANY
-
-#include <rtems/devnull.h>
-#include "tmacros.h"
-
-void force_error()
-{
-  int status;
-
-  status = rtems_io_register_name( "/dev/null", 0, 0 );
-  directive_failed( status, "io register" );
-
-  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