Make dwarfcmp -T test only dwarf_output, -TT for dwarf_edit, -TTT for both.

diff --git a/src/ChangeLog b/src/ChangeLog
index 238c77c928ffbc82742b6b1dc77a5738fc7e51a6..2ef1e42cc9f5ca2edb6c949046b4ad47c0c57185 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-06  Roland McGrath  <roland@redhat.com>
+
+       * dwarfcmp.cc (test_writer): Make it an int.
+       (parse_opt): Make -T increment it.
+       (main): Test only dwarf_output for -T, only dwarf_edit for -TT,
+       both only for -TTT.
+
 2009-07-03  Roland McGrath  <roland@redhat.com>
 
        * Makefile.am (AM_CXXFLAGS): Drop -Wno-unused-parameter.

diff --git a/src/dwarfcmp.cc b/src/dwarfcmp.cc
index 7f9468a9d4d4e609cfa8032eeb572effbe024f48..6ac78aab489692f95137456d066d707229bb031b 100644 (file)
--- a/src/dwarfcmp.cc
+++ b/src/dwarfcmp.cc
@@ -100,7 +100,7 @@ static bool quiet;
 static bool missing_ok;
 
 /* Nonzero to test writer classes.  */
-static bool test_writer;
+static int test_writer;
 
 
 static Dwarf *
@@ -270,6 +270,21 @@ test_classes (const dwarf1 &file1, const dwarf1 &file2,
   test_compare (file1, out2, expect);
 }
 
+template<class input>
+static void
+test_output (const dwarf &file1, const dwarf &file2,
+            bool two_tests, const input &in1, const input &in2, bool same)
+{
+  dwarf_output_collector c1;
+  dwarf_output_collector c2;
+  dwarf_output out1 (in1, c1);
+  dwarf_output out2 (in2, c2);
+
+  test_classes (file1, file2, out1, out2, same);
+
+  if (two_tests)
+    test_classes (in1, in2, out1, out2, same);
+}
 
 int
 main (int argc, char *argv[])
@@ -324,28 +339,15 @@ main (int argc, char *argv[])
                   ? quiet_cmp<dwarf, dwarf> () (file1, file2)
                   : noisy_cmp<dwarf, dwarf> () (file1, file2));
 
-      if (test_writer)
+      if (test_writer & 1)
+       test_output (file1, file2, false, file1, file2, same);
+      if (test_writer & 2)
        {
          dwarf_edit edit1 (file1);
          dwarf_edit edit2 (file2);
          test_classes (file1, file2, edit1, edit2, same);
-
-         {
-           dwarf_output_collector c1;
-           dwarf_output_collector c2;
-           dwarf_output out1 (file1, c1);
-           dwarf_output out2 (file2, c2);
-           test_classes (file1, file2, out1, out2, same);
-           test_classes (edit1, edit2, out1, out2, same);
-         }
-         {
-           dwarf_output_collector c1;
-           dwarf_output_collector c2;
-           dwarf_output out1 (edit1, c1);
-           dwarf_output out2 (edit2, c2);
-           test_classes (file1, file2, out1, out2, same);
-           test_classes (edit1, edit2, out1, out2, same);
-         }
+         if (test_writer & 1)
+           test_output (file1, file2, true, edit1, edit2, same);
        }
 
       result = !same;
@@ -383,7 +385,7 @@ parse_opt (int key, char *, struct argp_state *)
       break;
 
     case 'T':
-      test_writer = true;
+      ++test_writer;
       break;
 
     default: