diff options
| -rw-r--r-- | tests/ChangeLog | 7 | ||||
| -rwxr-xr-x | tests/run-nm-self.sh | 14 | ||||
| -rw-r--r-- | tests/test-subr.sh | 11 |
3 files changed, 26 insertions, 6 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index c9f94ff7..733d8e61 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,12 @@ 2014-01-16 Mark Wielaard <[email protected]> + * run-nm-self.sh: Don't use testrun_on_self_quiet but just testrun + on one ET_REL, one ET_EXEC and one ET_DYN file. + * test-subr.sh (self_test_files): Add two ET_REL files, only add + two libebl ET_DYN backend files. + +2014-01-16 Mark Wielaard <[email protected]> + * run-backtrace-demangle.sh: Check exitcode and max number of frames. 2014-01-18 Jan Kratochvil <[email protected]> diff --git a/tests/run-nm-self.sh b/tests/run-nm-self.sh index d2c12465..dac8e27b 100755 --- a/tests/run-nm-self.sh +++ b/tests/run-nm-self.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012 Red Hat, Inc. +# Copyright (C) 2012, 2014 Red Hat, Inc. # This file is part of elfutils. # # This file is free software; you can redistribute it and/or modify @@ -17,10 +17,20 @@ . $srcdir/test-subr.sh +# Test different command line combinations on the nm binary itself. +# Test on nm ET_REL, ET_EXEC and ET_DYN files. +ET_REL=${abs_top_builddir}/src/nm.o +ET_EXEC=${abs_top_builddir}/src/nm +ET_DYN=${abs_top_builddir}/libelf/libelf.so for what_arg in --debug-syms --defined-only --dynamic --extern-only; do for format_arg in --format=bsd --format=sysv --format=posix; do for out_arg in --numeric-sort --no-sort --reverse-sort; do - testrun_on_self_quiet ${abs_top_builddir}/src/nm $what_arg $format_arg $out_arg + for self_file in $ET_REL $ET_EXEC $ET_DYN; do + # --dynamic doesn't make sense for ET_REL. + if ! test "$what_arg" == "--dynamic" -a "$self_file" == "$ET_REL"; then + testrun ${abs_top_builddir}/src/nm $what_arg $format_arg $out_arg $self_file > /dev/null + fi + done done done done diff --git a/tests/test-subr.sh b/tests/test-subr.sh index b5ab1059..5e796b4d 100644 --- a/tests/test-subr.sh +++ b/tests/test-subr.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2013 Red Hat, Inc. +# Copyright (C) 2005-2014 Red Hat, Inc. # This file is part of elfutils. # # This file is free software; you can redistribute it and/or modify @@ -118,9 +118,12 @@ program_transform() self_test_files=`echo ${abs_top_builddir}/src/addr2line \ ${abs_top_builddir}/src/elfcmp ${abs_top_builddir}/src/elflint \ ${abs_top_builddir}/src/nm ${abs_top_builddir}/src/objdump \ -${abs_top_builddir}/src/readelf ${abs_top_builddir}/src/size \ -${abs_top_builddir}/src/strip ${abs_top_builddir}/libelf/libelf.so \ -${abs_top_builddir}/libdw/libdw.so ${abs_top_builddir}/backends/libebl_*.so` +${abs_top_builddir}/src/readelf \ +${abs_top_builddir}/src/size.o ${abs_top_builddir}/src/strip.o \ +${abs_top_builddir}/libelf/libelf.so \ +${abs_top_builddir}/libdw/libdw.so \ +${abs_top_builddir}/backends/libebl_i386.so \ +${abs_top_builddir}/backends/libebl_x86_64.so` # Provide a command to run on all self-test files with testrun. testrun_on_self() |