0004-disable-tests-if-HAVE_SHARED-is-not-set.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From b23a0c664498b7cca99e9e9cc06a2c18b0799663 Mon Sep 17 00:00:00 2001
  2. From: Waldemar Brodkorb <wbx@openadk.org>
  3. Date: Sun, 7 Sep 2014 16:38:14 +0200
  4. Subject: [PATCH 4/4] disable tests if HAVE_SHARED is not set
  5. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
  6. ---
  7. test/nptl/Makefile.in | 12 ++++++------
  8. 1 file changed, 6 insertions(+), 6 deletions(-)
  9. diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
  10. index dd53f91..d20d2c1 100644
  11. --- a/test/nptl/Makefile.in
  12. +++ b/test/nptl/Makefile.in
  13. @@ -38,11 +38,10 @@ TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3 \
  14. tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 tst-cancelx16 \
  15. tst-cancelx18 tst-cancelx20 tst-cancelx21 tst-cleanupx0 tst-cleanupx1 \
  16. tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 tst-cond22 tst-cond23 \
  17. - tst-dlsym1 tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \
  18. + tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \
  19. tst-oddstacklimit tst-oncex3 tst-oncex4 tst-rwlock2a \
  20. - tst-basic7 tst-fini1 tst-signal7 \
  21. - tst-unload tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 tst-sem12 \
  22. - tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \
  23. + tst-basic7 tst-signal7 tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 \
  24. + tst-sem12 tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \
  25. tst-initializers1-gnu89 tst-initializers1-gnu99
  26. #
  27. @@ -68,7 +67,8 @@ GLIBC_TESTS_DISABLED := tst-eintr1_glibc tst-eintr2_glibc \
  28. ifeq ($(HAVE_SHARED),)
  29. -TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5
  30. +TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5 tst-dlsym1 tst-fini1 \
  31. + tst-unload
  32. else
  33. GLIBC_TESTS_DISABLED += tst-tls3_glibc tst-tls4_glibc tst-tls5_glibc
  34. endif
  35. @@ -109,7 +109,7 @@ LDFLAGS_tst-rwlock14 = -lrt
  36. LDFLAGS_tst-fini1 = -Wl,-rpath=./ tst-fini1mod.so
  37. LDFLAGS_tst-fini1mod.so = -Wl,-soname=tst-fini1mod.so
  38. LDFLAGS_tst-unload = -ldl
  39. -LDFLAGS_tst-cancel5 := -lpthread -lpthread_nonshared
  40. +LDFLAGS_tst-cancel5 := -lpthread
  41. LDFLAGS_tst-cancel23 := -lc -lpthread
  42. LDFLAGS_tst-vfork1x := -lc -lpthread
  43. LDFLAGS_tst-vfork2x := -lc -lpthread
  44. --
  45. 1.8.5.2 (Apple Git-48)