From 2748fb3b919e397e5a17ac7b33d3b2027c00ba1f Mon Sep 17 00:00:00 2001 From: Antoine Busque Date: Thu, 19 May 2016 12:21:29 -0400 Subject: [PATCH] Standardise spelling of debug info MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Debug info being short for debugging information is two separate words. Therefore, the debuginfo spelling is erroneous. Variables and defines throughout the code and build system should therefore use 'debug_info' or 'DEBUG_INFO', whereas command-line options and file names should use the 'debug-info' form. In free form text (i.e. comments and documentation), 'debug info' should be used, or the long form 'debugging information'. Signed-off-by: Antoine Busque Signed-off-by: Jérémie Galarneau --- configure.ac | 34 +++++++++--------- converter/Makefile.am | 4 +-- converter/babeltrace.c | 6 ++-- doc/{debuginfo.txt => debug-info.txt} | 0 formats/ctf-text/Makefile.am | 4 +-- formats/ctf-text/ctf-text.c | 2 +- formats/ctf-text/types/integer.c | 2 +- formats/ctf/Makefile.am | 4 +-- formats/ctf/ctf.c | 2 +- include/Makefile.am | 4 +-- include/babeltrace/ctf-ir/metadata.h | 4 +-- .../babeltrace/{debuginfo.h => debug-info.h} | 12 +++---- .../{trace-debuginfo.h => trace-debug-info.h} | 14 ++++---- include/babeltrace/types.h | 4 +-- lib/Makefile.am | 10 +++--- lib/{debuginfo.c => debug-info.c} | 2 +- tests/Makefile.am | 6 ++-- ...8cdd87f7fe64c13b6daad553987eafd40cbb.debug | Bin .../README.md | 4 +-- .../libhello.c | 0 .../libhello.h | 0 .../libhello_build_id_so | Bin .../libhello_debug_link_so | Bin .../libhello_debug_link_so.debug | Bin .../libhello_elf_so | Bin .../libhello_so | Bin .../{debuginfo-data => debug-info-data}/tp.c | 0 .../{debuginfo-data => debug-info-data}/tp.h | 0 tests/lib/Makefile.am | 6 ++-- tests/lib/test_bin_info_complete.in | 4 +-- tests/lib/test_dwarf_complete.in | 4 +-- 31 files changed, 67 insertions(+), 65 deletions(-) rename doc/{debuginfo.txt => debug-info.txt} (100%) rename include/babeltrace/{debuginfo.h => debug-info.h} (92%) rename include/babeltrace/{trace-debuginfo.h => trace-debug-info.h} (93%) rename lib/{debuginfo.c => debug-info.c} (99%) rename tests/{debuginfo-data => debug-info-data}/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug (100%) rename tests/{debuginfo-data => debug-info-data}/README.md (96%) rename tests/{debuginfo-data => debug-info-data}/libhello.c (100%) rename tests/{debuginfo-data => debug-info-data}/libhello.h (100%) rename tests/{debuginfo-data => debug-info-data}/libhello_build_id_so (100%) rename tests/{debuginfo-data => debug-info-data}/libhello_debug_link_so (100%) rename tests/{debuginfo-data => debug-info-data}/libhello_debug_link_so.debug (100%) rename tests/{debuginfo-data => debug-info-data}/libhello_elf_so (100%) rename tests/{debuginfo-data => debug-info-data}/libhello_so (100%) rename tests/{debuginfo-data => debug-info-data}/tp.c (100%) rename tests/{debuginfo-data => debug-info-data}/tp.h (100%) diff --git a/configure.ac b/configure.ac index 9fe8cee7..63a75482 100644 --- a/configure.ac +++ b/configure.ac @@ -142,11 +142,11 @@ AC_CHECK_FUNCS([ \ ]) MINGW32=no -DEFAULT_ENABLE_DEBUGINFO=yes +DEFAULT_ENABLE_DEBUG_INFO=yes AS_CASE([$host_os], [solaris*|darwin*], [ - DEFAULT_ENABLE_DEBUGINFO=no + DEFAULT_ENABLE_DEBUG_INFO=no ], [mingw*], [ @@ -278,24 +278,26 @@ if test "x${enable_python_bindings_doc:-yes}" = xyes; then ) fi -# Set default enable state for debug info -AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no]) +# Set default enable state for debug info. +# The _enable_debug_info variable is prepended with an underscore to +# avoid clashing with the one generated by AC_ARG_ENABLE. +AS_IF([test "x$DEFAULT_ENABLE_DEBUG_INFO" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no]) -# Optional debuginfo feature +# Optional debug info feature # Do _not_ indent the help string below (appears in the configure --help # output). AC_ARG_ENABLE([debug-info], -[AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])] -[AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], - [AS_IF([test "x$enableval" = xyes], [enable_debuginfo=yes], [enable_debuginfo=no])], []) +[AC_HELP_STRING([--enable-debug-info], [enable the debug info feature (default on Linux)])] +[AC_HELP_STRING([--disable-debug-info], [disable the debug info feature (default on OS X and Solaris)])], + [AS_IF([test "x$enableval" = xyes], [_enable_debug_info=yes], [_enable_debug_info=no])], []) -AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes]) -AS_IF([test "x$enable_debuginfo" = xyes], [ +AM_CONDITIONAL([ENABLE_DEBUG_INFO], [test "x$_enable_debug_info" = xyes]) +AS_IF([test "x$_enable_debug_info" = xyes], [ # Check if libelf and libdw are present - AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debug-info.)]) - AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debug-info.)]) - AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug-info feature. You can disable this feature using --disable-debug-info.)]) - AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature]) + AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) + AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) + AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) + AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature]) ], []) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0]) @@ -407,8 +409,8 @@ PPRINT_PROP_BOOL([Python bindings], $value) test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Python bindings doc], $value) -# debug-info enabled/disabled -test "x$enable_debuginfo" = "xyes" && value=1 || value=0 +# debug info enabled/disabled +test "x$_enable_debug_info" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Debug information output], $value) diff --git a/converter/Makefile.am b/converter/Makefile.am index aba3333d..47693f5a 100644 --- a/converter/Makefile.am +++ b/converter/Makefile.am @@ -19,8 +19,8 @@ babeltrace_LDADD = \ $(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la \ $(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.la -if ENABLE_DEBUGINFO -babeltrace_LDADD += $(top_builddir)/lib/libdebuginfo.la +if ENABLE_DEBUG_INFO +babeltrace_LDADD += $(top_builddir)/lib/libdebug-info.la endif babeltrace_log_SOURCES = babeltrace-log.c diff --git a/converter/babeltrace.c b/converter/babeltrace.c index abfe1784..d61c245e 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -138,7 +138,7 @@ static struct poptOption long_options[] = { { "clock-gmt", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_GMT, NULL, NULL }, { "clock-force-correlate", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_FORCE_CORRELATE, NULL, NULL }, { "stream-intersection", 0, POPT_ARG_NONE, NULL, OPT_STREAM_INTERSECTION, NULL, NULL }, -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO { "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_DIR, NULL, NULL }, { "debug-info-full-path", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_INFO_FULL_PATH, NULL, NULL }, { "debug-info-target-prefix", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_TARGET_PREFIX, NULL, NULL }, @@ -189,7 +189,7 @@ static void usage(FILE *fp) fprintf(fp, " --clock-force-correlate Assume that clocks are inherently correlated\n"); fprintf(fp, " across traces.\n"); fprintf(fp, " --stream-intersection Only print events when all streams are active.\n"); -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO fprintf(fp, " --debug-info-dir Directory in which to look for debugging information\n"); fprintf(fp, " files. (default: /usr/lib/debug/)\n"); fprintf(fp, " --debug-info-target-prefix Directory to use as a prefix for executable lookup\n"); diff --git a/doc/debuginfo.txt b/doc/debug-info.txt similarity index 100% rename from doc/debuginfo.txt rename to doc/debug-info.txt diff --git a/formats/ctf-text/Makefile.am b/formats/ctf-text/Makefile.am index d8180e85..f913de7a 100644 --- a/formats/ctf-text/Makefile.am +++ b/formats/ctf-text/Makefile.am @@ -15,6 +15,6 @@ libbabeltrace_ctf_text_la_LIBADD = \ $(top_builddir)/lib/libbabeltrace.la \ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la -if ENABLE_DEBUGINFO -libbabeltrace_ctf_text_la_LIBADD += $(top_builddir)/lib/libdebuginfo.la +if ENABLE_DEBUG_INFO +libbabeltrace_ctf_text_la_LIBADD += $(top_builddir)/lib/libdebug-info.la endif diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 26df6eed..883a10a8 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c index f4d39256..ca0e5e60 100644 --- a/formats/ctf-text/types/integer.c +++ b/formats/ctf-text/types/integer.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definition) { diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am index 2f4f5ff7..2eb526d1 100644 --- a/formats/ctf/Makefile.am +++ b/formats/ctf/Makefile.am @@ -23,6 +23,6 @@ libbabeltrace_ctf_la_LIBADD = \ writer/libctf-writer.la \ ir/libctf-ir.la -if ENABLE_DEBUGINFO -libbabeltrace_ctf_la_LIBADD += $(top_builddir)/lib/libdebuginfo.la +if ENABLE_DEBUG_INFO +libbabeltrace_ctf_la_LIBADD += $(top_builddir)/lib/libdebug-info.la endif diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index c2e38701..4c3e3029 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 6a26c1b6..fcbd6a3d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -51,8 +51,8 @@ noinst_HEADERS = \ babeltrace/types.h \ babeltrace/object-internal.h \ babeltrace/crc32.h \ - babeltrace/debuginfo.h \ - babeltrace/trace-debuginfo.h \ + babeltrace/debug-info.h \ + babeltrace/trace-debug-info.h \ babeltrace/dwarf.h \ babeltrace/bin-info.h \ babeltrace/utils.h \ diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index f40fb86c..4d291c75 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -191,7 +191,7 @@ struct ctf_tracer_env { char tracer_name[TRACER_ENV_LEN]; }; -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO struct debug_info; #endif @@ -234,7 +234,7 @@ struct ctf_trace { int dirfd; int flags; /* open flags */ -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO /* Debug information for this trace */ struct debug_info *debug_info; #endif diff --git a/include/babeltrace/debuginfo.h b/include/babeltrace/debug-info.h similarity index 92% rename from include/babeltrace/debuginfo.h rename to include/babeltrace/debug-info.h index d85c36c4..029b44f1 100644 --- a/include/babeltrace/debuginfo.h +++ b/include/babeltrace/debug-info.h @@ -1,5 +1,5 @@ -#ifndef _BABELTRACE_DEBUGINFO_H -#define _BABELTRACE_DEBUGINFO_H +#ifndef _BABELTRACE_DEBUG_INFO_H +#define _BABELTRACE_DEBUG_INFO_H /* * Babeltrace - Debug information state tracker @@ -31,7 +31,7 @@ struct debug_info; struct ctf_event_definition; -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO #include #include @@ -65,7 +65,7 @@ BT_HIDDEN void debug_info_handle_event(struct debug_info *debug_info, struct ctf_event_definition *event); -#else /* ifdef ENABLE_DEBUGINFO */ +#else /* ifdef ENABLE_DEBUG_INFO */ static inline struct debug_info *debug_info_create(void) { return malloc(1); } @@ -77,6 +77,6 @@ static inline void debug_info_handle_event(struct debug_info *debug_info, struct ctf_event_definition *event) { } -#endif /* ENABLE_DEBUGINFO */ +#endif /* ENABLE_DEBUG_INFO */ -#endif /* _BABELTRACE_DEBUGINFO_H */ +#endif /* _BABELTRACE_DEBUG_INFO_H */ diff --git a/include/babeltrace/trace-debuginfo.h b/include/babeltrace/trace-debug-info.h similarity index 93% rename from include/babeltrace/trace-debuginfo.h rename to include/babeltrace/trace-debug-info.h index ed629231..451d54f5 100644 --- a/include/babeltrace/trace-debuginfo.h +++ b/include/babeltrace/trace-debug-info.h @@ -1,5 +1,5 @@ -#ifndef _BABELTRACE_TRACE_DEBUGINFO_H -#define _BABELTRACE_TRACE_DEBUGINFO_H +#ifndef _BABELTRACE_TRACE_DEBUG_INFO_H +#define _BABELTRACE_TRACE_DEBUG_INFO_H /* * Babeltrace - Debug information state tracker wrapper @@ -28,9 +28,9 @@ #include -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO -#include +#include #include #include @@ -124,7 +124,7 @@ void handle_debug_info_event(struct ctf_stream_declaration *stream_class, debug_info_handle_event(stream_class->trace->debug_info, event); } -#else /* #ifdef ENABLE_DEBUGINFO */ +#else /* #ifdef ENABLE_DEBUG_INFO */ static inline void ctf_text_integer_write_debug_info(struct bt_stream_pos *ppos, @@ -152,6 +152,6 @@ void handle_debug_info_event(struct ctf_stream_declaration *stream_class, /* Do nothing. */ } -#endif /* #else #ifdef ENABLE_DEBUGINFO */ +#endif /* #else #ifdef ENABLE_DEBUG_INFO */ -#endif /* _BABELTRACE_TRACE_DEBUGINFO_H */ +#endif /* _BABELTRACE_TRACE_DEBUG_INFO_H */ diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index 6dd08fc5..b4198c8f 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -148,7 +148,7 @@ struct declaration_integer { struct ctf_clock *clock; }; -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO struct debug_info_source; #endif @@ -161,7 +161,7 @@ struct definition_integer { int64_t _signed; } value; -#ifdef ENABLE_DEBUGINFO +#ifdef ENABLE_DEBUG_INFO /* * Debug infos (NULL if not set). * diff --git a/lib/Makefile.am b/lib/Makefile.am index 86423fdf..8096d789 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -15,16 +15,16 @@ libbabeltrace_la_SOURCES = babeltrace.c \ libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION) -if ENABLE_DEBUGINFO -noinst_LTLIBRARIES = libdebuginfo.la +if ENABLE_DEBUG_INFO +noinst_LTLIBRARIES = libdebug-info.la -libdebuginfo_la_SOURCES = debuginfo.c \ +libdebug_info_la_SOURCES = debug-info.c \ bin-info.c \ dwarf.c \ crc32.c \ utils.c -libdebuginfo_la_LDFLAGS = -lelf -ldw -libdebuginfo_la_LIBADD = libbabeltrace.la +libdebug_info_la_LDFLAGS = -lelf -ldw +libdebug_info_la_LIBADD = libbabeltrace.la endif libbabeltrace_la_LIBADD = \ diff --git a/lib/debuginfo.c b/lib/debug-info.c similarity index 99% rename from lib/debuginfo.c rename to lib/debug-info.c index bdf599db..aa19ce40 100644 --- a/lib/debuginfo.c +++ b/lib/debug-info.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/Makefile.am b/tests/Makefile.am index 467b191f..9cc4a3da 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,10 +16,10 @@ TESTS = bin/test_trace_read \ lib/test_bt_ctf_field_type_validation EXTRA_DIST = $(srcdir)/ctf-traces/** \ - $(srcdir)/debuginfo-data/** \ - $(srcdir)/debuginfo-data/.build-id/cd/** + $(srcdir)/debug-info-data/** \ + $(srcdir)/debug-info-data/.build-id/cd/** -if ENABLE_DEBUGINFO +if ENABLE_DEBUG_INFO TESTS += lib/test_dwarf_complete \ lib/test_bin_info_complete endif diff --git a/tests/debuginfo-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug b/tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug similarity index 100% rename from tests/debuginfo-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug rename to tests/debug-info-data/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug diff --git a/tests/debuginfo-data/README.md b/tests/debug-info-data/README.md similarity index 96% rename from tests/debuginfo-data/README.md rename to tests/debug-info-data/README.md index db131bc4..6a4c36c3 100644 --- a/tests/debuginfo-data/README.md +++ b/tests/debug-info-data/README.md @@ -1,8 +1,8 @@ -debuginfo-data +debug-info-data ============== This directory contains pre-generated ELF and DWARF files used to test -the debug-info analysis feature, including lookup of DWARF debugging +the debug info analysis feature, including lookup of DWARF debugging information via build ID and debug link methods, as well as the source files used to generate them. diff --git a/tests/debuginfo-data/libhello.c b/tests/debug-info-data/libhello.c similarity index 100% rename from tests/debuginfo-data/libhello.c rename to tests/debug-info-data/libhello.c diff --git a/tests/debuginfo-data/libhello.h b/tests/debug-info-data/libhello.h similarity index 100% rename from tests/debuginfo-data/libhello.h rename to tests/debug-info-data/libhello.h diff --git a/tests/debuginfo-data/libhello_build_id_so b/tests/debug-info-data/libhello_build_id_so similarity index 100% rename from tests/debuginfo-data/libhello_build_id_so rename to tests/debug-info-data/libhello_build_id_so diff --git a/tests/debuginfo-data/libhello_debug_link_so b/tests/debug-info-data/libhello_debug_link_so similarity index 100% rename from tests/debuginfo-data/libhello_debug_link_so rename to tests/debug-info-data/libhello_debug_link_so diff --git a/tests/debuginfo-data/libhello_debug_link_so.debug b/tests/debug-info-data/libhello_debug_link_so.debug similarity index 100% rename from tests/debuginfo-data/libhello_debug_link_so.debug rename to tests/debug-info-data/libhello_debug_link_so.debug diff --git a/tests/debuginfo-data/libhello_elf_so b/tests/debug-info-data/libhello_elf_so similarity index 100% rename from tests/debuginfo-data/libhello_elf_so rename to tests/debug-info-data/libhello_elf_so diff --git a/tests/debuginfo-data/libhello_so b/tests/debug-info-data/libhello_so similarity index 100% rename from tests/debuginfo-data/libhello_so rename to tests/debug-info-data/libhello_so diff --git a/tests/debuginfo-data/tp.c b/tests/debug-info-data/tp.c similarity index 100% rename from tests/debuginfo-data/tp.c rename to tests/debug-info-data/tp.c diff --git a/tests/debuginfo-data/tp.h b/tests/debug-info-data/tp.h similarity index 100% rename from tests/debuginfo-data/tp.h rename to tests/debug-info-data/tp.h diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 9770db12..976e4cf0 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -44,17 +44,17 @@ check_SCRIPTS = test_seek_big_trace \ test_seek_empty_packet \ test_ctf_writer_complete -if ENABLE_DEBUGINFO +if ENABLE_DEBUG_INFO test_dwarf_LDFLAGS = -static test_dwarf_LDADD = $(LIBTAP) \ $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/lib/libdebuginfo.la + $(top_builddir)/lib/libdebug-info.la test_dwarf_SOURCES = test_dwarf.c test_bin_info_LDFLAGS = -static test_bin_info_LDADD = $(LIBTAP) \ $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/lib/libdebuginfo.la + $(top_builddir)/lib/libdebug-info.la test_bin_info_SOURCES = test_bin_info.c noinst_PROGRAMS += test_dwarf test_bin_info diff --git a/tests/lib/test_bin_info_complete.in b/tests/lib/test_bin_info_complete.in index bcf4be2d..3ca7ca23 100755 --- a/tests/lib/test_bin_info_complete.in +++ b/tests/lib/test_bin_info_complete.in @@ -17,6 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -DEBUGINFO_DATA="@abs_top_srcdir@/tests/debuginfo-data" +DEBUG_INFO_DATA="@abs_top_srcdir@/tests/debug-info-data" -"@abs_top_builddir@/tests/lib/test_bin_info" "$DEBUGINFO_DATA" +"@abs_top_builddir@/tests/lib/test_bin_info" "$DEBUG_INFO_DATA" diff --git a/tests/lib/test_dwarf_complete.in b/tests/lib/test_dwarf_complete.in index d5b94f6c..a3f026d6 100755 --- a/tests/lib/test_dwarf_complete.in +++ b/tests/lib/test_dwarf_complete.in @@ -17,6 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -DEBUGINFO_DATA="@abs_top_srcdir@/tests/debuginfo-data" +DEBUG_INFO_DATA="@abs_top_srcdir@/tests/debug-info-data" -"@abs_top_builddir@/tests/lib/test_dwarf" "$DEBUGINFO_DATA" +"@abs_top_builddir@/tests/lib/test_dwarf" "$DEBUG_INFO_DATA" -- 2.34.1