diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rwxr-xr-x | tests/run-arsymtest.sh | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index c549fa0b..5ebc1bd4 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2013-11-01 Michael Forney <[email protected]> + + * Makefile.am (TESTS_ENVIRONMENT): Use and export NM. + * run-arsymtest.sh: Use NM. + 2013-11-05 Mark Wielaard <[email protected]> * allfcts.c (main): Correct dwarf_getfuncs return value check. diff --git a/tests/Makefile.am b/tests/Makefile.am index d07cb0b0..bc97523b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -231,7 +231,8 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \ export abs_srcdir; export abs_builddir; \ export abs_top_builddir; \ export libdir; export bindir; \ - export LC_ALL; export LANG; export VALGRIND_CMD; + export LC_ALL; export LANG; export VALGRIND_CMD; \ + NM=$(NM); export NM; installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \ installed $(tests_rpath) \ '$(program_transform_name)' @@ -244,7 +245,8 @@ TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \ abs_top_builddir=$(abs_top_builddir); \ export abs_srcdir; export abs_builddir; \ export abs_top_builddir; \ - export LC_ALL; export LANG; export VALGRIND_CMD; + export LC_ALL; export LANG; export VALGRIND_CMD; \ + NM=$(NM); export NM; LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \ $(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm diff --git a/tests/run-arsymtest.sh b/tests/run-arsymtest.sh index dc016e1f..b0fdfcd6 100755 --- a/tests/run-arsymtest.sh +++ b/tests/run-arsymtest.sh @@ -28,7 +28,7 @@ tempfiles $okfile $tmpfile $testfile result=77 if test -f $lib; then # Generate list using `nm' we check against. - nm -s $lib | + ${NM} -s $lib | sed -e '1,/^Arch/d' -e '/^$/,$d' | sort > $okfile |