A better test for a dlopen problem with weak symbols, based

on a much improve test by mjn3.

1 files changed, 24 insertions, 18 deletions

diff --git a/test/ldso/dltest.c b/test/ldso/dltest.c
index 676e1ae55..244f3b76b 100644
--- a/test/ldso/dltest.c
+++ b/test/ldso/dltest.c
@@ -2,38 +2,44 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <dlfcn.h>
-
-extern void _dlinfo();
-
-int main(int argc, char **argv) {
-	void *handle;
-	int (*myhowdy)(const char *s);
-	char *error;
+#include <stdint.h>
 
 #ifdef __UCLIBC__
-	_dlinfo();   /* not supported by ld.so.2 */
+extern void _dlinfo(void);
 #endif
 
-	handle = dlopen ("./libhowdy.so", RTLD_LAZY);
+int main(int argc, char **argv) 
+{
+	int ret = EXIT_SUCCESS;
+	void *handle;
+	void (*mydltest)(void *value1, void *value2);
+	char *error;
+	uint32_t *value1, *value2;
 
+	handle = dlopen (LIBNAME, RTLD_LAZY);
 	if (!handle) {
-		fputs (dlerror(), stderr);
+		fprintf(stderr, "Could not open ./libtest.so: %s\n", dlerror());
 		exit(1);
 	}
 
-	myhowdy = dlsym(handle, "howdy");
+	mydltest = dlsym(handle, "dltest");
 	if ((error = dlerror()) != NULL)  {
-		fputs(error, stderr);
+		fprintf(stderr, "Could not locate symbol 'dltest': %s\n", error);
 		exit(1);
 	}
 
-	myhowdy("hello world!\n");
-
-#ifdef __UCLIBC__
-	_dlinfo();   /* not supported by ld.so.2 */
-#endif
+	mydltest(&value1, &value2);
+	printf("dltest: __pthread_return_0=%p\n", value1);
+	printf("dltest: pthread_self=%p\n", value2);
+	if (value1 == value2) {
+	    ret = EXIT_FAILURE;
+	    printf("dltest: values should NOT be equal  Weak values resolved incorrectly!\n");
+	} else {
+	    printf("dltest: weak symbols resoved correctly.\n");
+	}
 
 	dlclose(handle);
 
-	return EXIT_SUCCESS;
+	return ret;
 }
+