Commit 6a0ff702 authored by Martin Storsjö's avatar Martin Storsjö Committed by Niels Möller

* 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
parent 4dc2fdea
...@@ -89,7 +89,7 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) \ ...@@ -89,7 +89,7 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) \
# The PATH update is for locating dlls on w*ndows. # The PATH update is for locating dlls on w*ndows.
check: $(TS_ALL) $(srcdir)/run-tests check: $(TS_ALL) $(srcdir)/run-tests
LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ 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 Makefile: $(srcdir)/Makefile.in ../config.status
......
...@@ -6,7 +6,7 @@ if [ -z "$srcdir" ] ; then ...@@ -6,7 +6,7 @@ if [ -z "$srcdir" ] ; then
srcdir=`pwd` srcdir=`pwd`
fi fi
# FIXME: Check libhogweed.a too. : ${NM:=nm}
# * nm on aix seems to generate bogus outbut including random binary # * 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 # data. Using -g is a workaround to get rid of that. But nm -g
...@@ -16,7 +16,7 @@ fi ...@@ -16,7 +16,7 @@ fi
# * gcc on x86 generates functions like __i686.get_pc_thunk.bx in pic # * gcc on x86 generates functions like __i686.get_pc_thunk.bx in pic
# code. # code.
( nm -g ../libnettle.a || nm ../libnettle.a ) \ ( $NM -g ../libnettle.a || $NM ../libnettle.a ) \
| grep ' [DRT] ' | egrep -v '( |^)\.?_?(_?nettle_|memxor)|get_pc_thunk' \ | grep ' [DRT] ' | egrep -v '( |^)\.?_?(_?nettle_|memxor)|get_pc_thunk' \
| sort -k3 > test1.out | sort -k3 > test1.out
...@@ -27,7 +27,7 @@ if [ -s test1.out ] ; then ...@@ -27,7 +27,7 @@ if [ -s test1.out ] ; then
fi fi
if [ -s ../libhogweed.a ] ; then 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' \ | grep ' [DRT] ' | egrep -v '( |^)\.?_?_?nettle_|get_pc_thunk' \
| sort -k3 > test1.out | sort -k3 > test1.out
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment