diff options
| -rw-r--r-- | libctf/config.h.in | 3 | ||||
| -rwxr-xr-x | libctf/configure | 2 | ||||
| -rw-r--r-- | libctf/configure.ac | 2 | ||||
| -rw-r--r-- | libctf/testsuite/lib/ctf-lib.exp | 5 | ||||
| -rw-r--r-- | libctf/testsuite/libctf-regression/open-error-free.c | 13 |
5 files changed, 23 insertions, 2 deletions
diff --git a/libctf/config.h.in b/libctf/config.h.in index 794779e..359f1f5 100644 --- a/libctf/config.h.in +++ b/libctf/config.h.in @@ -115,6 +115,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <valgrind/valgrind.h> header file. */ +#undef HAVE_VALGRIND_VALGRIND_H + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff --git a/libctf/configure b/libctf/configure index 1faadef..7466d56 100755 --- a/libctf/configure +++ b/libctf/configure @@ -16552,7 +16552,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -for ac_header in byteswap.h endian.h +for ac_header in byteswap.h endian.h valgrind/valgrind.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/libctf/configure.ac b/libctf/configure.ac index cf0e988..64544b8 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -109,7 +109,7 @@ if test $ac_cv_libctf_bfd_elf = yes; then fi AC_C_BIGENDIAN -AC_CHECK_HEADERS(byteswap.h endian.h) +AC_CHECK_HEADERS(byteswap.h endian.h valgrind/valgrind.h) AC_CHECK_FUNCS(pread) dnl Check for bswap_{16,32,64} diff --git a/libctf/testsuite/lib/ctf-lib.exp b/libctf/testsuite/lib/ctf-lib.exp index eb2b738..cfd36be 100644 --- a/libctf/testsuite/lib/ctf-lib.exp +++ b/libctf/testsuite/lib/ctf-lib.exp @@ -270,6 +270,11 @@ proc run_lookup_test { name } { set results [run_host_cmd "$opts(wrapper) tmpdir/lookup" $lookup_output] } + if { [regexp {^UNSUPPORTED: (.*)$} $results -> reason] } { + unsupported "$testname: $reason" + return 0 + } + set f [open "tmpdir/lookup.out" "w"] puts $f $results close $f diff --git a/libctf/testsuite/libctf-regression/open-error-free.c b/libctf/testsuite/libctf-regression/open-error-free.c index 5e48744..edc5f34 100644 --- a/libctf/testsuite/libctf-regression/open-error-free.c +++ b/libctf/testsuite/libctf-regression/open-error-free.c @@ -1,6 +1,7 @@ /* Make sure that, on error, an opened dict is properly freed. */ #define _GNU_SOURCE 1 +#include "config.h" #include <dlfcn.h> #include <stdio.h> #include <stdlib.h> @@ -8,6 +9,10 @@ #include <ctf-api.h> #include <ctf.h> +#ifdef HAVE_VALGRIND_VALGRIND_H +#include <valgrind/valgrind.h> +#endif + static unsigned long long malloc_count; static unsigned long long free_count; @@ -111,6 +116,14 @@ int main (void) ctf_next_t *it = NULL; unsigned long long frozen_malloc_count, frozen_free_count; +#ifdef HAVE_VALGRIND_VALGRIND_H + if (RUNNING_ON_VALGRIND) + { + printf ("UNSUPPORTED: valgrind interferes with malloc counting\n"); + return 0; + } +#endif + if ((fp = ctf_create (&err)) == NULL) goto open_err; |