Merge branch 'dwarf' into mjw/dwarf_outputupstream/mjw/dwarf_output

3 files changed, 14 insertions, 11 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a00733f7..8a39c5bf 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-24  Roland McGrath  <[email protected]>
+
+	* Makefile.am (TESTS): Put the slow dwarfcmp tests last.
+
 2011-02-02  Josh Stone  <[email protected]>
 
 	* run-prelink-addr-test.sh: Add testfile55, 32 and 64-bit.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 616f900f..641bce2e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -87,9 +87,11 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
 	run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
 	run-disasm-x86.sh run-disasm-x86-64.sh \
 	run-early-offscn.sh run-dwarf-getmacros.sh \
-	run-dwarfcmp-self.sh run-dwarflint-self.sh run-dwarf-attributes.sh \
-	run-dwarf_edit.sh dwarf_edit_output run-dwarfcmp-test-self.sh \
-	run-test-flag-nobits.sh run-prelink-addr-test.sh
+	run-dwarf-attributes.sh \
+	run-dwarf_edit.sh dwarf_edit_output \
+	run-test-flag-nobits.sh run-prelink-addr-test.sh \
+	run-dwarflint-self.sh \
+	run-dwarfcmp-self.sh run-dwarfcmp-test-self.sh
 # run-show-ciefde.sh
 
 if !STANDALONE
@@ -212,8 +214,7 @@ dwarf_print_LDADD = $(libdwpp) $(libmudflap) -ldl
 dwarf_edit_SOURCES = dwarf_edit.cc print-die.cc
 dwarf_edit_LDADD = $(libdwpp) $(libmudflap) -ldl
 
-dwarf_edit_output_SOURCES = dwarf_edit_output.cc print-die.cc \
-			    ../src/dwarfstrings.c
+dwarf_edit_output_SOURCES = dwarf_edit_output.cc print-die.cc
 dwarf_edit_output_LDADD = $(libdwpp) $(libmudflap) -ldl
 
 arextract_LDADD = $(libelf) $(libmudflap)
diff --git a/tests/dwarf_edit_output.cc b/tests/dwarf_edit_output.cc
index b1483d19..7e3def94 100644
--- a/tests/dwarf_edit_output.cc
+++ b/tests/dwarf_edit_output.cc
@@ -37,8 +37,6 @@
 
 #include "c++/subr.hh"
 
-#include "../src/dwarfstrings.h"
-
 using namespace elfutils;
 using namespace std;
 
@@ -520,7 +518,7 @@ test_last_two_dies (dwarf_edit &in, dwarf_output &out, int tag, bool same,
       cmp compare;
       if (compare.compare_dies (*die1, *die2, in) != same)
 	error (-1, 0, "dwarf_comparator fail %s test #%d '%s'",
-	       dwarf_tag_string (tag), n, name);
+	       dwarf::tags::name (tag).c_str (), n, name);
     }
 
   dwarf_output::compile_units_type::const_iterator cu;
@@ -537,7 +535,7 @@ test_last_two_dies (dwarf_edit &in, dwarf_output &out, int tag, bool same,
       it++;
     }
   if (show_output)
-    cout << "offset last (" << dwarf_tag_string (tag) << ") cu1: "
+    cout << "offset last (" << dwarf::tags::name (tag) << ") cu1: "
 	 << hex << off1 << endl;
 
   cu++;
@@ -549,14 +547,14 @@ test_last_two_dies (dwarf_edit &in, dwarf_output &out, int tag, bool same,
       it++;
     }
   if (show_output)
-    cout << "offset last (" << dwarf_tag_string (tag) << ") cu2: "
+    cout << "offset last (" << dwarf::tags::name (tag) << ") cu2: "
 	 << hex << off2 << endl;
 
   bool both_zero = off1 == 0 && off2 == 0;
   bool equal = off1 == off2;
   if (! both_zero && equal != same)
     error (-1, 0, "dwarf_comparator fail %s test #%d '%s'",
-	   dwarf_tag_string (tag), n, name);
+	   dwarf::tags::name (tag).c_str (), n, name);
 
 }