[PATCH 3/3] tests: Test addr2line -i with lexical blocks present

[Josh Stone <jistone at redhat dot com>]

This test is for the fix in commit aecdf2670c02, but it was hampered by
unlucky sorting of line records.  With the new stable sort, the test now
gets the desired line numbers.

Signed-off-by: Josh Stone <jistone@redhat.com>
---
 tests/ChangeLog                   |   8 +++++
 tests/Makefile.am                 |   4 ++-
 tests/run-addr2line-i-lex-test.sh |  71 ++++++++++++++++++++++++++++++++++++++
 tests/testfile-lex-inlines.bz2    | Bin 0 -> 2599 bytes
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100755 tests/run-addr2line-i-lex-test.sh
 create mode 100755 tests/testfile-lex-inlines.bz2

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9d229c9d639c..85826f339f54 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-11  Josh Stone  <jistone@redhat.com>
+
+	* run-addr2line-i-lex-test.sh: New test.
+	* testfile-lex-inlines.bz2: New testfile.
+	* Makefile.am (EXTRA_DIST): Add run-addr2line-i-lex-test.sh and
+	testfile-lex-inlines.bz2.
+	(TESTS): Add run-addr2line-i-lex-test.sh.
+
 2014-12-10  Josh Stone  <jistone@redhat.com>
 
 	* run-addr2line-i-test.sh: Test 0x5f0 to make sure linkage_name is
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b381130616b..bdd2997d9557 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -101,7 +101,8 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
 	run-test-archive64.sh run-readelf-vmcoreinfo.sh \
 	run-readelf-mixed-corenote.sh run-dwfllines.sh \
 	run-dwfl-report-elf-align.sh run-addr2line-test.sh \
-	run-addr2line-i-test.sh run-varlocs.sh run-funcretval.sh \
+	run-addr2line-i-test.sh run-addr2line-i-lex-test.sh \
+	run-varlocs.sh run-funcretval.sh \
 	run-backtrace-native.sh run-backtrace-data.sh run-backtrace-dwarf.sh \
 	run-backtrace-native-biarch.sh run-backtrace-native-core.sh \
 	run-backtrace-native-core-biarch.sh run-backtrace-core-x86_64.sh \
@@ -243,6 +244,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
 	     testfilenolines.bz2 test-core-lib.so.bz2 test-core.core.bz2 \
 	     test-core.exec.bz2 run-addr2line-test.sh \
 	     run-addr2line-i-test.sh testfile-inlines.bz2 \
+	     run-addr2line-i-lex-test.sh testfile-lex-inlines.bz2 \
 	     testfileppc32.bz2 testfileppc64.bz2 \
 	     testfiles390.bz2 testfiles390x.bz2 \
 	     testfilearm.bz2 testfileaarch64.bz2 \
diff --git a/tests/run-addr2line-i-lex-test.sh b/tests/run-addr2line-i-lex-test.sh
new file mode 100755
index 000000000000..c391fd9996d9
--- /dev/null
+++ b/tests/run-addr2line-i-lex-test.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2014 Red Hat, Inc.
+# This file is part of elfutils.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# elfutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. $srcdir/test-subr.sh
+
+# // g++ x.cpp -g -fPIC -olibx.so -shared -O3 -fvisibility=hidden
+#
+# void foobar()
+# {
+#   __asm__ ( "nop" ::: );
+# }
+#
+# void foo()
+# {
+#   {
+#     void (*bar) () = foobar;
+#     bar();
+#   }
+# }
+
+testfiles testfile-lex-inlines
+
+testrun_compare ${abs_top_builddir}/src/addr2line -i -e testfile-lex-inlines 0x0000000000000680 <<\EOF
+/tmp/x.cpp:5
+EOF
+
+testrun_compare ${abs_top_builddir}/src/addr2line -i -e testfile-lex-inlines 0x0000000000000681 <<\EOF
+/tmp/x.cpp:5
+EOF
+
+testrun_compare ${abs_top_builddir}/src/addr2line -i -e testfile-lex-inlines 0x0000000000000690 <<\EOF
+/tmp/x.cpp:5
+/tmp/x.cpp:12
+EOF
+
+testrun_compare ${abs_top_builddir}/src/addr2line -i -e testfile-lex-inlines 0x0000000000000691 <<\EOF
+/tmp/x.cpp:5
+/tmp/x.cpp:12
+EOF
+
+# All together now (plus function names).
+testrun_compare ${abs_top_builddir}/src/addr2line -f -i -e testfile-lex-inlines 0x0000000000000680 0x0000000000000681 0x0000000000000690 0x0000000000000691 <<\EOF
+_Z6foobarv
+/tmp/x.cpp:5
+_Z6foobarv
+/tmp/x.cpp:5
+foobar inlined at /tmp/x.cpp:12 in _Z3foov
+/tmp/x.cpp:5
+_Z3foov
+/tmp/x.cpp:12
+foobar inlined at /tmp/x.cpp:12 in _Z3foov
+/tmp/x.cpp:5
+_Z3foov
+/tmp/x.cpp:12
+EOF
+
+exit 0
diff --git a/tests/testfile-lex-inlines.bz2 b/tests/testfile-lex-inlines.bz2
new file mode 100755
index 0000000000000000000000000000000000000000..716e792763d5b7d156aa597f8b8e7c80689e2ce8
GIT binary patch
literal 2599
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
JLO(a)fxf{+8Zx3~ZR

literal 0
HcmV?d00001

-- 
2.1.0