Module Name: src
Committed By: he
Date: Wed Mar 30 11:43:16 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi shl.mi
src/tests/lib/libc/tls: Makefile
Log Message:
Put tests depending on dlopen etc. under a test for MKPIC, and move
the corresponding entries in the set lists over to the shl.mi file.
This should bring the sun2 port back to a buildable state.
To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/tests/shl.mi
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/tls/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.279 src/distrib/sets/lists/tests/mi:1.280
--- src/distrib/sets/lists/tests/mi:1.279 Wed Mar 30 09:43:21 2011
+++ src/distrib/sets/lists/tests/mi Wed Mar 30 11:43:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.279 2011/03/30 09:43:21 jruoho Exp $
+# $NetBSD: mi,v 1.280 2011/03/30 11:43:15 he Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -420,10 +420,6 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_cerror.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigqueue.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/tls tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dlopen.so.1.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dynamic.so.1.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dlopen.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dynamic.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_static.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/ttyio tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/ttyio/t_ptm.debug tests-lib-debug debug,atf
@@ -1869,12 +1865,6 @@
./usr/tests/lib/libc/sys/t_sigqueue tests-lib-tests atf
./usr/tests/lib/libc/tls tests-lib-tests
./usr/tests/lib/libc/tls/Atffile tests-lib-tests atf
-./usr/tests/lib/libc/tls/h_tls_dlopen.so tests-lib-tests atf
-./usr/tests/lib/libc/tls/h_tls_dlopen.so.1 tests-lib-tests atf
-./usr/tests/lib/libc/tls/libh_tls_dynamic.so tests-lib-tests atf
-./usr/tests/lib/libc/tls/libh_tls_dynamic.so.1 tests-lib-tests atf
-./usr/tests/lib/libc/tls/t_tls_dlopen tests-lib-tests atf
-./usr/tests/lib/libc/tls/t_tls_dynamic tests-lib-tests atf
./usr/tests/lib/libc/tls/t_tls_static tests-lib-tests atf
./usr/tests/lib/libc/ttyio tests-lib-tests
./usr/tests/lib/libc/ttyio/Atffile tests-lib-tests atf
Index: src/distrib/sets/lists/tests/shl.mi
diff -u src/distrib/sets/lists/tests/shl.mi:1.2 src/distrib/sets/lists/tests/shl.mi:1.3
--- src/distrib/sets/lists/tests/shl.mi:1.2 Thu Sep 30 18:43:07 2010
+++ src/distrib/sets/lists/tests/shl.mi Wed Mar 30 11:43:16 2011
@@ -1,9 +1,19 @@
-# $NetBSD: shl.mi,v 1.2 2010/09/30 18:43:07 njoly Exp $
+# $NetBSD: shl.mi,v 1.3 2011/03/30 11:43:16 he Exp $
#
./usr/libdata/debug/usr/tests/lib/csu/libh_initfini3_dso.so.1.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dlopen.so.1.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dynamic.so.1.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dlopen.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dynamic.debug tests-lib-debug debug,atf
./usr/tests/lib/csu/h_initfini3_dso.so tests-lib-tests atf
./usr/tests/lib/csu/h_initfini3_dso.so.1 tests-lib-tests atf
./usr/tests/lib/csu/libh_initfini3_dso.so tests-obsolete obsolete
./usr/tests/lib/csu/libh_initfini3_dso.so.1 tests-obsolete obsolete
+./usr/tests/lib/libc/tls/h_tls_dlopen.so tests-lib-tests atf
+./usr/tests/lib/libc/tls/h_tls_dlopen.so.1 tests-lib-tests atf
+./usr/tests/lib/libc/tls/libh_tls_dynamic.so tests-lib-tests atf
+./usr/tests/lib/libc/tls/libh_tls_dynamic.so.1 tests-lib-tests atf
+./usr/tests/lib/libc/tls/t_tls_dlopen tests-lib-tests atf
+./usr/tests/lib/libc/tls/t_tls_dynamic tests-lib-tests atf
./usr/tests/util/id/libfake.so.0 tests-obsolete obsolete
./usr/tests/util/id/libfake.so.0.0 tests-obsolete obsolete
Index: src/tests/lib/libc/tls/Makefile
diff -u src/tests/lib/libc/tls/Makefile:1.2 src/tests/lib/libc/tls/Makefile:1.3
--- src/tests/lib/libc/tls/Makefile:1.2 Thu Mar 10 14:31:07 2011
+++ src/tests/lib/libc/tls/Makefile Wed Mar 30 11:43:15 2011
@@ -1,13 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2011/03/10 14:31:07 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/30 11:43:15 he Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/tls
+.if (${MKPIC} == "yes")
SUBDIR+= dso
+.endif
+
+TESTS_C+= t_tls_static
+.if (${MKPIC} == "yes")
+TESTS_C+= t_tls_dynamic t_tls_dlopen
+.endif
DSODIR!= cd ${.CURDIR}/../tls_dso && ${PRINTOBJDIR}
-TESTS_C+= t_tls_static t_tls_dynamic t_tls_dlopen
SRCS.t_tls_static= t_tls_static.c t_tls_static_helper.c
LDADD.t_tls_static+= -lpthread -static
LDADD.t_tls_dynamic+= -lpthread \
