Use newly-available --depth from dwarf-print in the test casepmachata/dwarf

3 files changed, 6 insertions, 29 deletions

diff --git a/libdw/c++/dwarf b/libdw/c++/dwarf
index c6a31a91..81d7d85c 100644
--- a/libdw/c++/dwarf
+++ b/libdw/c++/dwarf
@@ -637,7 +637,7 @@ namespace elfutils
 
 	inline attribute operator* () const
 	{
-	  if (unlikely (_m_offset == 1 && _m_attr.valp == NULL))
+	  if (unlikely (_m_attr.valp == NULL))
 	    throw std::runtime_error ("dereferencing end iterator");
 	  return attribute (_m_die, _m_attr);
 	}
diff --git a/tests/dwarf-attributes.sh b/tests/dwarf-attributes.sh
deleted file mode 100755
index be3363e7..00000000
--- a/tests/dwarf-attributes.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009 Red Hat, Inc.
-# This file is part of Red Hat elfutils.
-#
-# Red Hat elfutils 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; version 2 of the License.
-#
-# Red Hat 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 Red Hat elfutils; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
-#
-# Red Hat elfutils is an included package of the Open Invention Network.
-# An included package of the Open Invention Network is a package for which
-# Open Invention Network licensees cross-license their patents.  No patent
-# license is granted, either expressly or impliedly, by designation as an
-# included package.  Should you wish to participate in the Open Invention
-# Network licensing program, please visit www.openinventionnetwork.com
-# <http://www.openinventionnetwork.com>.
-
-./dwarf-print "$@" | sed -n '/compile_unit/{p;q;}'
diff --git a/tests/run-dwarf-attributes.sh b/tests/run-dwarf-attributes.sh
index b03f318b..e39c42f7 100755
--- a/tests/run-dwarf-attributes.sh
+++ b/tests/run-dwarf-attributes.sh
@@ -28,8 +28,11 @@
 
 testfiles testfile
 
-testrun_compare $srcdir/dwarf-attributes.sh testfile <<\EOF
- <compile_unit offset=[0xb] stmt_list=0 high_pc=0x804845a low_pc=0x804842c name="m.c" comp_dir="/home/drepper/gnu/new-bu/build/ttt" producer="GNU C 2.96 20000731 (Red Hat Linux 7.0)" language=0x1>
+testrun_compare ./dwarf-print --depth=1 testfile <<\EOF
+testfile:
+ <compile_unit offset=[0xb] stmt_list=0 high_pc=0x804845a low_pc=0x804842c name="m.c" comp_dir="/home/drepper/gnu/new-bu/build/ttt" producer="GNU C 2.96 20000731 (Red Hat Linux 7.0)" language=0x1>...
+ <compile_unit offset=[0xca] stmt_list=0x4b high_pc=0x8048466 low_pc=0x804845c name="b.c" comp_dir="/home/drepper/gnu/new-bu/build/ttt" producer="GNU C 2.96 20000731 (Red Hat Linux 7.0)" language=0x1>...
+ <compile_unit offset=[0x15fc] stmt_list=0x1e0 high_pc=0x8048472 low_pc=0x8048468 name="f.c" comp_dir="/home/drepper/gnu/new-bu/build/ttt" producer="GNU C 2.96 20000731 (Red Hat Linux 7.0)" language=0x1>...
 EOF
 
 exit 0