[src/trunk]: src Put tests depending on dlopen etc. under a test for MKPIC, a...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b1784c7d0008
branches:  trunk
changeset: 763669:b1784c7d0008
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 30 11:43:15 2011 +0000

description:
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.

diffstat:

 distrib/sets/lists/tests/mi     |  12 +-----------
 distrib/sets/lists/tests/shl.mi |  12 +++++++++++-
 tests/lib/libc/tls/Makefile     |  10 ++++++++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diffs (82 lines):

diff -r c02f83325ea4 -r b1784c7d0008 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Wed Mar 30 11:41:48 2011 +0000
+++ b/distrib/sets/lists/tests/mi       Wed Mar 30 11:43:15 2011 +0000
@@ -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
diff -r c02f83325ea4 -r b1784c7d0008 distrib/sets/lists/tests/shl.mi
--- a/distrib/sets/lists/tests/shl.mi   Wed Mar 30 11:41:48 2011 +0000
+++ b/distrib/sets/lists/tests/shl.mi   Wed Mar 30 11:43:15 2011 +0000
@@ -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
diff -r c02f83325ea4 -r b1784c7d0008 tests/lib/libc/tls/Makefile
--- a/tests/lib/libc/tls/Makefile       Wed Mar 30 11:41:48 2011 +0000
+++ b/tests/lib/libc/tls/Makefile       Wed Mar 30 11:43:15 2011 +0000
@@ -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 \