svn commit: trunk/uClibc/test/dlopen
vapier at uclibc.org
vapier at uclibc.org
Mon Mar 12 19:44:59 UTC 2007
Author: vapier
Date: 2007-03-12 12:44:58 -0700 (Mon, 12 Mar 2007)
New Revision: 18076
Log:
make sure undefine references in dlopen()-ed libs are handled graciously
Added:
trunk/uClibc/test/dlopen/dlafk.c
trunk/uClibc/test/dlopen/libafk-temp.c
trunk/uClibc/test/dlopen/libafk.c
Modified:
trunk/uClibc/test/dlopen/
trunk/uClibc/test/dlopen/Makefile
trunk/uClibc/test/dlopen/libundef.c
Changeset:
Property changes on: trunk/uClibc/test/dlopen
___________________________________________________________________
Name: svn:ignore
- dltest
dltest2
dlstatic
dlundef
test1
test2
test3
*_glibc
*.so
*.gdb
*.out
+ dlafk
dlstatic
dltest
dltest2
dlundef
test1
test2
test3
*_glibc
*.so
*.gdb
*.out
Modified: trunk/uClibc/test/dlopen/Makefile
===================================================================
--- trunk/uClibc/test/dlopen/Makefile 2007-03-12 19:22:52 UTC (rev 18075)
+++ trunk/uClibc/test/dlopen/Makefile 2007-03-12 19:44:58 UTC (rev 18076)
@@ -4,7 +4,7 @@
# rules need a little love to work with glibc ...
export UCLIBC_ONLY := 1
-TESTS := dltest dltest2 dlstatic test1 test2 test3 dlundef
+TESTS := dltest dltest2 dlstatic test1 test2 test3 dlundef dlafk
include ../Test.mak
@@ -15,6 +15,7 @@
LDFLAGS_dltest := -ldl -lpthread
LDFLAGS_dltest2 := -ldl -lpthread
LDFLAGS_dlundef := -ldl
+LDFLAGS_dlafk := -ldl ./libafk.so -Wl,-rpath,.
LDFLAGS_test1 := -ldl
LDFLAGS_test2 := -ldl
LDFLAGS_test3 := -ldl ./libtest1.so ./libtest2.so -Wl,-rpath,.
@@ -26,6 +27,9 @@
dltest2: libtest3.so
dlstatic: libstatic.so
dlundef: libundef.so
+dlafk: libafk.so
+libafk.so: libafk-temp.so
+LDFLAGS_libafk.so := ./libafk-temp.so -Wl,-rpath,.
test1: libtest1.so
test2: libtest1.so libtest2.so
test3: libtest1.so libtest2.so
Added: trunk/uClibc/test/dlopen/dlafk.c
===================================================================
--- trunk/uClibc/test/dlopen/dlafk.c (rev 0)
+++ trunk/uClibc/test/dlopen/dlafk.c 2007-03-12 19:44:58 UTC (rev 18076)
@@ -0,0 +1,36 @@
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dlfcn.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+
+#define LIBNAME "libafk.so"
+
+#define LIBAFK "libafk-temp.so"
+#define LIBAFK_BAK ".libafk-temp.so.temp"
+
+int main(int argc, char **argv)
+{
+ void *handle;
+
+ if (rename(LIBAFK, LIBAFK_BAK)) {
+ fprintf(stderr, "Unable to rename %s: %s\n", LIBAFK, strerror(errno));
+ return EXIT_FAILURE;
+ }
+
+ handle = dlopen(LIBNAME, RTLD_NOW);
+ if (!handle) {
+ fprintf(stderr, "Could not open ./%s: %s\n", LIBNAME, dlerror());
+ return EXIT_FAILURE;
+ }
+
+ if (rename(LIBAFK_BAK, LIBAFK)) {
+ fprintf(stderr, "Unable to rename %s: %s\n", LIBAFK_BAK, strerror(errno));
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
+}
Added: trunk/uClibc/test/dlopen/libafk-temp.c
===================================================================
--- trunk/uClibc/test/dlopen/libafk-temp.c (rev 0)
+++ trunk/uClibc/test/dlopen/libafk-temp.c 2007-03-12 19:44:58 UTC (rev 18076)
@@ -0,0 +1 @@
+/* the actual contents doesnt matter */
Added: trunk/uClibc/test/dlopen/libafk.c
===================================================================
--- trunk/uClibc/test/dlopen/libafk.c (rev 0)
+++ trunk/uClibc/test/dlopen/libafk.c 2007-03-12 19:44:58 UTC (rev 18076)
@@ -0,0 +1 @@
+/* the actual contents doesnt matter */
Modified: trunk/uClibc/test/dlopen/libundef.c
===================================================================
--- trunk/uClibc/test/dlopen/libundef.c 2007-03-12 19:22:52 UTC (rev 18075)
+++ trunk/uClibc/test/dlopen/libundef.c 2007-03-12 19:44:58 UTC (rev 18076)
@@ -1,15 +1 @@
-#include <stdio.h>
-
-static int global_static = -1;
-
-int static_test(void)
-{
- static int local_static = -2;
-
- if (global_static != -1)
- printf("FAIL: global_static is not -1\n");
- if (local_static != -2)
- printf("FAIL: local_static is not -2\n");
-
- return (global_static == -1 && local_static == -2);
-}
+/* the actual contents doesnt matter */
More information about the uClibc-cvs
mailing list