Merge branch 'gdb_index7'

diff --cc tests/ChangeLog
index 4fcc8fa4cfa7fbea27af895a22cc8d6e530bc7cb,9cc13c5a998b710154faf74e84d244d07f4470a9..03662b6a870958f5eee3d5a9cf20a6782ee2240e
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,12 -1,12 +1,21 @@@
+ 2012-06-27  Mark Wielaard  <mjw@redhat.com>
+ 
+       * run-readelf-gdb-index.sh: New test.
+       * testfilegdbindex5.bz2: New testfile.
+       * testfilegdbindex7.bz2: Likewise.
+       * Makefile.am (TESTS): Add run-readelf-gdb-index.sh.
+       (EXTRA_DIST): run-readelf-gdb_index.sh, testfilegdbindex5.bz2 and
+       testfilegdbindex7.bz2.
+ 
 +2012-07-17  Mark Wielaard  <mjw@redhat.com>
 +
 +      * testcore-rtlib-ppc.bz2: New testfile.
 +      * run-unstrip-n.sh: Check new ppc core testfile.
 +
 +2012-06-26  Mike Frysinger  <vapier@gentoo.org>
 +
 +      * Makefile.am (check_PROGRAMS): Rename from noinst_PROGRAMS.
 +
  2012-06-26  Mark Wielaard  <mjw@redhat.com>
  
        * run-macro-test.sh: New test.

diff --cc tests/Makefile.am
index ae9839f100a159e444ae98434332939cc74abb2c,4d7fa22b503fe0935603f8058fcba3894f0ae9ca..1bbf690d6e67838a41ecc25d4cfd5d584ac339e7
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -79,11 -79,11 +79,11 @@@ TESTS = run-arextract.sh run-arsymtest.
        run-early-offscn.sh run-dwarf-getmacros.sh \
        run-test-flag-nobits.sh run-prelink-addr-test.sh \
        run-dwarf-getstring.sh run-rerequest_tag.sh run-typeiter.sh \
-       run-readelf-d.sh run-unstrip-n.sh run-low_high_pc.sh \
-       run-macro-test.sh
+       run-readelf-d.sh run-readelf-gdb_index.sh run-unstrip-n.sh \
+       run-low_high_pc.sh run-macro-test.sh
  
  if !STANDALONE
 -noinst_PROGRAMS += msg_tst md5-sha1-test
 +check_PROGRAMS += msg_tst md5-sha1-test
  TESTS += msg_tst md5-sha1-test
  endif