summaryrefslogtreecommitdiffstats
path: root/testsuites/libtests/dl02
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-03-28 17:23:05 +1100
committerChris Johns <chrisj@rtems.org>2017-04-04 13:26:01 +1000
commitd2e31f70c12f6363cef79ffad781df6ec0acdfb5 (patch)
tree3ebf30b9233ccfbff397ef245f3b74f1f2bd69dd /testsuites/libtests/dl02
parentdosfs: Fix file name search (diff)
downloadrtems-d2e31f70c12f6363cef79ffad781df6ec0acdfb5.tar.bz2
libdl: Back port C++ exception throw and catch from 4.12.
Closes #2956.
Diffstat (limited to 'testsuites/libtests/dl02')
-rw-r--r--testsuites/libtests/dl02/dl02.scn16
-rw-r--r--testsuites/libtests/dl02/init.c2
2 files changed, 10 insertions, 8 deletions
diff --git a/testsuites/libtests/dl02/dl02.scn b/testsuites/libtests/dl02/dl02.scn
index f1b4489a5f..94fdfd7b66 100644
--- a/testsuites/libtests/dl02/dl02.scn
+++ b/testsuites/libtests/dl02/dl02.scn
@@ -1,22 +1,22 @@
+
+
*** BEGIN OF TEST libdl (RTL) 2 ***
load: /dl-o1.o
-handle: 0x2150d0 has unresolved externals
+handle: 0x204da80 has unresolved externals
load: /dl-o2.o
-handle: 0x215838 loaded
-Loaded module: argc:4
-[../../../../../../../../rtems.master/c/src/../../testsuites/libtests/dl02/dl-o1.c]
+handle: 0x204ea98 loaded
+Loaded module: argc:4 [/opt/work/chris/rtems/kernel/rtems.git/c/src/../../testsuites/libtests/dl02/dl-o1.c]
0: 1
1: 2
2: 3
3: 4
-Loaded module: argc:4
-[../../../../../../../../rtems.master/c/src/../../testsuites/libtests/dl02/dl-o2.c]
+Loaded module: argc:4 [/opt/work/chris/rtems/kernel/rtems.git/c/src/../../testsuites/libtests/dl02/dl-o2.c]
0: 1
1: 2
2: 3
3: 4
dl_o1_callback: string in dl_o2
rtems_main: callback count: 3
-handle: 0x2150d0 closed
-handle: 0x215838 closed
+handle: 0x204da80 closed
+handle: 0x204ea98 closed
*** END OF TEST libdl (RTL) 2 ***
diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c
index f761b465ae..bf2d1a9717 100644
--- a/testsuites/libtests/dl02/init.c
+++ b/testsuites/libtests/dl02/init.c
@@ -73,6 +73,8 @@ static void Init(rtems_task_argument arg)
#define CONFIGURE_EXTRA_TASK_STACKS (8 * 1024)
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+
#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE