From e3639f074c1bed857e376dd76542c878466627f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 24 Nov 2011 14:51:27 +0100
Subject: [PATCH] * testsuite/symbols-test: Use $NM, falling back to nm if
undefined. * testsuite/Makefile.in (check): Pass $(NM) in the environment of
run-tests.
Rev: nettle/testsuite/Makefile.in:1.16
Rev: nettle/testsuite/symbols-test:1.4
---
testsuite/Makefile.in | 2 +-
testsuite/symbols-test | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 2638c09e..ee530a7c 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -89,7 +89,7 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) \
# The PATH update is for locating dlls on w*ndows.
check: $(TS_ALL) $(srcdir)/run-tests
LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
- EMULATOR="$(EMULATOR)" $(srcdir)/run-tests $(TS_ALL)
+ EMULATOR="$(EMULATOR)" NM="$(NM)" $(srcdir)/run-tests $(TS_ALL)
Makefile: $(srcdir)/Makefile.in ../config.status
diff --git a/testsuite/symbols-test b/testsuite/symbols-test
index b4871262..ec8f4918 100755
--- a/testsuite/symbols-test
+++ b/testsuite/symbols-test
@@ -6,7 +6,7 @@ if [ -z "$srcdir" ] ; then
srcdir=`pwd`
fi
-# FIXME: Check libhogweed.a too.
+: ${NM:=nm}
# * nm on aix seems to generate bogus outbut including random binary
# data. Using -g is a workaround to get rid of that. But nm -g
@@ -16,7 +16,7 @@ fi
# * gcc on x86 generates functions like __i686.get_pc_thunk.bx in pic
# code.
-( nm -g ../libnettle.a || nm ../libnettle.a ) \
+( $NM -g ../libnettle.a || $NM ../libnettle.a ) \
| grep ' [DRT] ' | egrep -v '( |^)\.?_?(_?nettle_|memxor)|get_pc_thunk' \
| sort -k3 > test1.out
@@ -27,7 +27,7 @@ if [ -s test1.out ] ; then
fi
if [ -s ../libhogweed.a ] ; then
- ( nm -g ../libhogweed.a || nm ../libhogweed.a ) \
+ ( $NM -g ../libhogweed.a || $NM ../libhogweed.a ) \
| grep ' [DRT] ' | egrep -v '( |^)\.?_?_?nettle_|get_pc_thunk' \
| sort -k3 > test1.out
--
GitLab