8 files changed, 27 insertions, 3 deletions

diff --git a/test/libdwarf/ts/dwarf_die_query/Makefile b/test/libdwarf/ts/dwarf_die_query/Makefile
index efcf1bc97c4e..0f99aa3e1bbf 100644
--- a/test/libdwarf/ts/dwarf_die_query/Makefile
+++ b/test/libdwarf/ts/dwarf_die_query/Makefile
@@ -1,8 +1,8 @@
-# $Id: Makefile 2084 2011-10-27 04:48:12Z jkoshy $
+# $Id: Makefile 3075 2014-06-23 03:08:57Z kaiwang27 $
 
 TOP=	../../../..
 
 TS_SRCS=	dwarf_die_query.c
-TS_DATA=	dt32-g1 dt64-g1 ec32-g1 ec64-g1 dto64-g1
+TS_DATA=	dt32-g1 dt64-g1 ec32-g1 ec64-g1 dto64-g1 ld_symver.o-64-g1
 
 .include "${TOP}/mk/elftoolchain.tet.mk"
diff --git a/test/libdwarf/ts/dwarf_die_query/dt32-g1.xml.gz b/test/libdwarf/ts/dwarf_die_query/dt32-g1.xml.gz
index 2cda689a7945..1fc085142117 100644
--- a/test/libdwarf/ts/dwarf_die_query/dt32-g1.xml.gz
+++ b/test/libdwarf/ts/dwarf_die_query/dt32-g1.xml.gz
diff --git a/test/libdwarf/ts/dwarf_die_query/dt64-g1.xml.gz b/test/libdwarf/ts/dwarf_die_query/dt64-g1.xml.gz
index 211645acbf43..6a1a6fd54759 100644
--- a/test/libdwarf/ts/dwarf_die_query/dt64-g1.xml.gz
+++ b/test/libdwarf/ts/dwarf_die_query/dt64-g1.xml.gz
diff --git a/test/libdwarf/ts/dwarf_die_query/dto64-g1.xml.gz b/test/libdwarf/ts/dwarf_die_query/dto64-g1.xml.gz
index 7b2d38d04585..2cd4ea5a2ff7 100644
--- a/test/libdwarf/ts/dwarf_die_query/dto64-g1.xml.gz
+++ b/test/libdwarf/ts/dwarf_die_query/dto64-g1.xml.gz
diff --git a/test/libdwarf/ts/dwarf_die_query/dwarf_die_query.c b/test/libdwarf/ts/dwarf_die_query/dwarf_die_query.c
index 45b9c44d1abe..5c99fc230497 100644
--- a/test/libdwarf/ts/dwarf_die_query/dwarf_die_query.c
+++ b/test/libdwarf/ts/dwarf_die_query/dwarf_die_query.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: dwarf_die_query.c 2084 2011-10-27 04:48:12Z jkoshy $
+ * $Id: dwarf_die_query.c 3075 2014-06-23 03:08:57Z kaiwang27 $
  */
 
 #include <assert.h>
@@ -42,15 +42,18 @@
  */
 
 static void tp_dwarf_die_query(void);
+static void tp_dwarf_die_query_types(void);
 static void tp_dwarf_die_query_sanity(void);
 static struct dwarf_tp dwarf_tp_array[] = {
 	{"tp_dwarf_die_query", tp_dwarf_die_query},
+	{"tp_dwarf_die_query_types", tp_dwarf_die_query_types},
 	{"tp_dwarf_die_query_sanity", tp_dwarf_die_query_sanity},
 	{NULL, NULL},
 };
 static int result = TET_UNRESOLVED;
 #include "driver.c"
 #include "die_traverse.c"
+#include "die_traverse2.c"
 
 static void
 _dwarf_die_query(Dwarf_Die die)
@@ -103,6 +106,27 @@ done:
 }
 
 static void
+tp_dwarf_die_query_types(void)
+{
+	Dwarf_Debug dbg;
+	Dwarf_Error de;
+	int fd;
+
+	result = TET_UNRESOLVED;
+
+	TS_DWARF_INIT(dbg, fd, de);
+
+	TS_DWARF_DIE_TRAVERSE2(dbg, 0, _dwarf_die_query);
+
+	if (result == TET_UNRESOLVED)
+		result = TET_PASS;
+
+done:
+	TS_DWARF_FINISH(dbg, de);
+	TS_RESULT(result);
+}
+
+static void
 tp_dwarf_die_query_sanity(void)
 {
 	Dwarf_Debug dbg;
diff --git a/test/libdwarf/ts/dwarf_die_query/ec32-g1.xml.gz b/test/libdwarf/ts/dwarf_die_query/ec32-g1.xml.gz
index d54847f126ea..0dde7100876f 100644
--- a/test/libdwarf/ts/dwarf_die_query/ec32-g1.xml.gz
+++ b/test/libdwarf/ts/dwarf_die_query/ec32-g1.xml.gz
diff --git a/test/libdwarf/ts/dwarf_die_query/ec64-g1.xml.gz b/test/libdwarf/ts/dwarf_die_query/ec64-g1.xml.gz
index 21559130a679..3c9890e18d00 100644
--- a/test/libdwarf/ts/dwarf_die_query/ec64-g1.xml.gz
+++ b/test/libdwarf/ts/dwarf_die_query/ec64-g1.xml.gz
diff --git a/test/libdwarf/ts/dwarf_die_query/ld_symver.o-64-g1.xml.gz b/test/libdwarf/ts/dwarf_die_query/ld_symver.o-64-g1.xml.gz
new file mode 100644
index 000000000000..c8de24e2c300
--- /dev/null
+++ b/test/libdwarf/ts/dwarf_die_query/ld_symver.o-64-g1.xml.gz