summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-12-22 09:13:08 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-01-08 09:00:53 +0100
commitfe100e16117c36c40e99a853d09cd8dcf98dbff0 (patch)
tree81eb8dd6469908a103e3ade1d378c3a24ff9781b /testsuites
parentbsp/qoriq: Use array for FMan modules (diff)
downloadrtems-fe100e16117c36c40e99a853d09cd8dcf98dbff0.tar.bz2
score: Add fatal errors for NULL entry init tasks
This simplifies the global construction. Update #2514.
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/psxtests/psxfatal01/testcase.h5
-rw-r--r--testsuites/sptests/spfatal02/testcase.h7
-rw-r--r--testsuites/sptests/spinternalerror02/init.c6
-rw-r--r--testsuites/sptests/spinternalerror02/spinternalerror02.scn5
4 files changed, 15 insertions, 8 deletions
diff --git a/testsuites/psxtests/psxfatal01/testcase.h b/testsuites/psxtests/psxfatal01/testcase.h
index 2426e7b413..b400fa6cfa 100644
--- a/testsuites/psxtests/psxfatal01/testcase.h
+++ b/testsuites/psxtests/psxfatal01/testcase.h
@@ -27,9 +27,10 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = {
#define FATAL_ERROR_TEST_NAME "1"
#define FATAL_ERROR_DESCRIPTION \
"POSIX API Init thread create failure - NULL entry"
-#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_POSIX_API
+#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE
#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
-#define FATAL_ERROR_EXPECTED_ERROR ((POSIX_FD_PTHREAD << 8) | EFAULT)
+#define FATAL_ERROR_EXPECTED_ERROR \
+ INTERNAL_ERROR_POSIX_INIT_THREAD_ENTRY_IS_NULL
void force_error(void)
{
diff --git a/testsuites/sptests/spfatal02/testcase.h b/testsuites/sptests/spfatal02/testcase.h
index 90437014bf..bd9ac6785e 100644
--- a/testsuites/sptests/spfatal02/testcase.h
+++ b/testsuites/sptests/spfatal02/testcase.h
@@ -24,9 +24,10 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
#define FATAL_ERROR_TEST_NAME "2"
#define FATAL_ERROR_DESCRIPTION "Classic API Init task start failure"
-#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API
-#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE
-#define FATAL_ERROR_EXPECTED_ERROR RTEMS_INVALID_ADDRESS
+#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE
+#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
+#define FATAL_ERROR_EXPECTED_ERROR \
+ INTERNAL_ERROR_RTEMS_INIT_TASK_ENTRY_IS_NULL
void force_error()
{
diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
index 5d1d26f67b..cbc81a54f4 100644
--- a/testsuites/sptests/spinternalerror02/init.c
+++ b/testsuites/sptests/spinternalerror02/init.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2012-2015 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Donierstr. 4
@@ -35,7 +35,9 @@ static void test_internal_error_text(void)
puts( text );
} while ( text != text_last );
- rtems_test_assert( error - 3 == INTERNAL_ERROR_RESOURCE_IN_USE );
+ rtems_test_assert(
+ error - 3 == INTERNAL_ERROR_POSIX_INIT_THREAD_ENTRY_IS_NULL
+ );
}
static void test_fatal_source_text(void)
diff --git a/testsuites/sptests/spinternalerror02/spinternalerror02.scn b/testsuites/sptests/spinternalerror02/spinternalerror02.scn
index 115965484e..c6e85b11b9 100644
--- a/testsuites/sptests/spinternalerror02/spinternalerror02.scn
+++ b/testsuites/sptests/spinternalerror02/spinternalerror02.scn
@@ -1,4 +1,4 @@
-*** TEST SPINTERNALERROR 2 ***
+*** BEGIN OF TEST SPINTERNALERROR 2 ***
INTERNAL_ERROR_NO_CONFIGURATION_TABLE
INTERNAL_ERROR_NO_CPU_TABLE
INTERNAL_ERROR_TOO_LITTLE_WORKSPACE
@@ -24,6 +24,9 @@ INTERNAL_ERROR_GXX_KEY_ADD_FAILED
INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED
INTERNAL_ERROR_NO_MEMORY_FOR_HEAP
INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR
+INTERNAL_ERROR_RESOURCE_IN_USE
+INTERNAL_ERROR_RTEMS_INIT_TASK_ENTRY_IS_NULL
+INTERNAL_ERROR_POSIX_INIT_THREAD_ENTRY_IS_NULL
?
?
INTERNAL_ERROR_CORE