Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/libexec/ld.elf_so Skip all tests on architectures w/o ...



details:   https://anonhg.NetBSD.org/src/rev/6a8f16844b87
branches:  trunk
changeset: 828753:6a8f16844b87
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 30 16:53:34 2017 +0000

description:
Skip all tests on architectures w/o ifunc linker/ld.elf_so support.

diffstat:

 tests/libexec/ld.elf_so/t_ifunc.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 0ad94b95a270 -r 6a8f16844b87 tests/libexec/ld.elf_so/t_ifunc.c
--- a/tests/libexec/ld.elf_so/t_ifunc.c Sat Dec 30 16:35:03 2017 +0000
+++ b/tests/libexec/ld.elf_so/t_ifunc.c Sat Dec 30 16:53:34 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_ifunc.c,v 1.5 2017/11/06 21:16:03 joerg Exp $        */
+/*     $NetBSD: t_ifunc.c,v 1.6 2017/12/30 16:53:34 martin Exp $       */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,6 +35,13 @@
 
 #include "h_macros.h"
 
+#if !defined( __arm__) && !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__sparc__)
+#define        LINKER_SUPPORT()        \
+       atf_tc_skip("Missing linker support for ifunc relocations")
+#else
+#define        LINKER_SUPPORT()        /* yes */
+#endif
+
 ATF_TC(rtld_ifunc);
 
 ATF_TC_HEAD(rtld_ifunc, tc)
@@ -56,9 +63,7 @@
        const char *error;
        size_t i;
 
-#if !defined( __arm__) && !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__sparc__)
-       atf_tc_expect_fail("Missing linker support for hidden ifunc relocations");
-#endif
+       LINKER_SUPPORT();
 
        for (i = 0; i < __arraycount(envstr); ++i) {
                setenv("USE_IFUNC2", envstr[i], 1);
@@ -111,6 +116,8 @@
        const char *error;
        size_t i;
 
+       LINKER_SUPPORT();
+
        for (i = 0; i < __arraycount(envstr); ++i) {
                setenv("USE_IFUNC2", envstr[i], 1);
 
@@ -172,6 +179,7 @@
 
 ATF_TC_BODY(rtld_main_ifunc, tc)
 {
+       LINKER_SUPPORT();
        ATF_CHECK(ifunc() == 0xdeadbeef);
 }
 



Home | Main Index | Thread Index | Old Index