move the ldso tests to dlopen where they belong

7 files changed, 30 insertions, 53 deletions

diff --git a/test/Makefile b/test/Makefile
index 1c7af473f..2a0f3c0a2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -22,7 +22,7 @@ TOPDIR=../
 .EXPORT_ALL_VARIABLES:
 
 
-ALL_SUBDIRS = args assert ctype ldso pwd_grp signal silly stdlib string unistd crypt #misc
+ALL_SUBDIRS = args assert ctype dlopen pwd_grp signal silly stdlib string unistd crypt #misc
 DIRS = $(ALL_SUBDIRS)
 #ifeq ($(TARGET_ARCH), $(HOST_ARCH))
 #	DIRS = $(ALL_SUBDIRS)
@@ -31,7 +31,7 @@ DIRS = $(ALL_SUBDIRS)
 #endif
 ifeq ($(strip $(HAVE_SHARED)),true)
   ifeq ($(strip $(DODYNAMIC)),true)
-	DIRS += ldso
+	DIRS += dlopen
   endif	
 endif	
 ifeq ($(strip $(INCLUDE_THREADS)),true)
diff --git a/test/dlopen/.cvsignore b/test/dlopen/.cvsignore
index 373baecfa..406a0ac40 100644
--- a/test/dlopen/.cvsignore
+++ b/test/dlopen/.cvsignore
@@ -6,3 +6,8 @@ dlttest2
 test1
 test2
 test3
+dltest
+dltest2
+libtest.so
+libtest3.so
+.gdbinit
diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile
index cd8af9095..8ac46503e 100644
--- a/test/dlopen/Makefile
+++ b/test/dlopen/Makefile
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Library General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Makefile for uClibc
 
 TESTDIR=../
 include $(TESTDIR)/Rules.mak
@@ -42,13 +43,32 @@ libtest1.so: libtest1.o
 libtest2.so: libtest2.o
 	$(CC) $(CFLAGS) -fPIC -shared -o libtest2.so -Wl,-soname,libtest2.so libtest2.o
 
-run: libtest2.so libtest1.so test1 test2 test3
+dltest: dltest.c
+	$(CC) $(CFLAGS) -DLIBNAME="\"./libtest.so\"" dltest.c -ldl -lpthread -o dltest
+
+libtest.so: libtest.c
+	$(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,libtest.so libtest.c -o libtest.so
+
+# Second time, directly link libtest3.so with libpthread
+dltest2: dltest.c
+	$(CC) $(CFLAGS) -DLIBNAME="\"./libtest3.so\"" dltest.c -ldl -lpthread -o dltest2
+
+libtest3.so: libtest.c
+	$(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,libtest3.so libtest.c -o libtest3.so -lpthread
+
+run: libtest2.so libtest1.so test1 test2 test3 dltest libtest.so dltest2 libtest3.so
 	@echo "----------running test 1--------------"
 	-LD_LIBRARY_PATH=`pwd`:. LD_DEBUG=all ./test1
 	@echo "----------running test 2--------------"
 	-LD_LIBRARY_PATH=`pwd`:. LD_DEBUG=all ./test2
 	@echo "----------running test 3--------------"
 	-LD_LIBRARY_PATH=`pwd`:. LD_DEBUG=all ./test3
+	@echo "----------running test 3--------------"
+	-LD_DEBUG=all ./dltest2
+	@echo "----------running test 4--------------"
+	-LD_DEBUG=all ./dltest
 
 clean:
-	rm -f *.o libtest1.so* libtest2.so* test1 test2 test3
+	rm -f *.o libtest1.so* libtest2.so* test1 test2 test3 \
+		dltest dltest2 libtest.so libtest3.so
+
diff --git a/test/ldso/dltest.c b/test/dlopen/dltest.c
index 244f3b76b..244f3b76b 100644
--- a/test/ldso/dltest.c
+++ b/test/dlopen/dltest.c
diff --git a/test/ldso/libtest.c b/test/dlopen/libtest.c
index cdb37403d..cdb37403d 100644
--- a/test/ldso/libtest.c
+++ b/test/dlopen/libtest.c
diff --git a/test/ldso/.cvsignore b/test/ldso/.cvsignore
deleted file mode 100644
index 7232c47f9..000000000
--- a/test/ldso/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-dltest
-dltest2
-libtest.so
-libtest2.so
diff --git a/test/ldso/Makefile b/test/ldso/Makefile
deleted file mode 100644
index bfd8444c7..000000000
--- a/test/ldso/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-all: run
-
-
-dltest: dltest.c
-	$(CC) $(CFLAGS) -DLIBNAME="\"./libtest.so\"" dltest.c -ldl -lpthread -o dltest
-
-libtest.so: libtest.c
-	$(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,libtest.so libtest.c -o libtest.so
-
-# Second time, directly link libtest2.so with libpthread
-dltest2: dltest.c
-	$(CC) $(CFLAGS) -DLIBNAME="\"./libtest2.so\"" dltest.c -ldl -lpthread -o dltest2
-
-libtest2.so: libtest.c
-	$(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,libtest2.so libtest.c -o libtest2.so -lpthread
-
-run: dltest libtest.so dltest2 libtest2.so
-	./dltest2
-	./dltest
-
-clean:
-	rm -f *.o dltest dltest2 libtest.so libtest2.so
-