Unify dwarf{cmp,lint} -i option syntax.

diff --git a/src/ChangeLog b/src/ChangeLog
index 988cc4b647743c5ebe4c68a08d40c7b81191c00e..bec43217bb75e66db05d1b1760e2273a31df566a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-10  Roland McGrath  <roland@redhat.com>
+
+       * dwarflint.c (options, parse_opt): Replace --gnu with
+       -i/--ignore-missing, to match dwarfcmp.
+
 2009-01-10  Petr Machata  <pmachata@redhat.com>
 
        * dwarflint.c: Implement --no-debug: silently accept file, if its

diff --git a/src/dwarflint.c b/src/dwarflint.c
index 82217d07c5992991382e9991d6f5d01903387ef8..f6f9cd0e23c5ccca76f874705158785f91e5cfc9 100644 (file)
--- a/src/dwarflint.c
+++ b/src/dwarflint.c
@@ -53,7 +53,6 @@ const char *argp_program_bug_address = PACKAGE_BUGREPORT;
 
 #define ARGP_strict    300
 #define ARGP_gnu       301
-#define ARGP_nodebug   302
 
 /* Definitions of arguments for argp functions.  */
 static const struct argp_option options[] =
@@ -62,8 +61,8 @@ static const struct argp_option options[] =
   { "strict", ARGP_strict, NULL, 0,
     N_("Be extremely strict, flag level 2 features."), 0 },
   { "quiet", 'q', NULL, 0, N_("Do not print anything if successful"), 0 },
-  { "no-debug", ARGP_nodebug, NULL, 0,
-    N_("Accept silently if no debug info is available."), 0 },
+  { "ignore-missing", 'i', NULL, 0,
+    N_("Don't complain if files have no DWARF at all"), 0 },
   { "gnu", ARGP_gnu, NULL, 0,
     N_("Binary has been created with GNU toolchain and is therefore known to be \
 broken in certain ways"), 0 },
@@ -283,7 +282,7 @@ parse_opt (int key, char *arg __attribute__ ((unused)),
       warning_criteria.reject |= mc_acc_bloat;
       break;
 
-    case ARGP_nodebug:
+    case 'i':
       tolerate_nodebug = true;
       break;
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b18af041f2616c3b002596a5b800b5cab9542af7..08032769511cba0f7cc049fe9337c2ee42e007d2 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-10  Roland McGrath  <roland@redhat.com>
+
+       * run-dwarflint-self.sh: --no-debug -> -i
+
+       * run-dwarfcmp-self.sh: Run both with and without -q.
+
 2009-01-10  Petr Machata  <pmachata@redhat.com>
 
        * run-dwarflint-self.sh: Pass new option --no-debug to dwarflint.

diff --git a/tests/run-dwarfcmp-self.sh b/tests/run-dwarfcmp-self.sh
index 7cdd093df9ff303899edc9cba4250aed5e85382d..2aa5b4bda7cfbc3e636dfe38cefac3ea90f85ceb 100755 (executable)
--- a/tests/run-dwarfcmp-self.sh
+++ b/tests/run-dwarfcmp-self.sh
@@ -31,6 +31,7 @@ runtest()
   for file; do
     if [ -f $file ]; then
       testrun ../src/dwarfcmp -q -i $file $file ||
+      testrun ../src/dwarfcmp -i $file $file ||
       { echo "*** failure in $file"; status=1; }
     fi
   done

diff --git a/tests/run-dwarflint-self.sh b/tests/run-dwarflint-self.sh
index 16dd1597b829eaaf42ce8e72ac588484c3172cc0..d1f6ca25dabfb5a149d4925271c8dd6b8e088ca6 100755 (executable)
--- a/tests/run-dwarflint-self.sh
+++ b/tests/run-dwarflint-self.sh
@@ -30,7 +30,7 @@ runtest()
 {
   for file; do
     if [ -f $file ]; then
-      testrun ../src/dwarflint -q --gnu --no-debug $file ||
+      testrun ../src/dwarflint -q -i --gnu $file ||
       { echo "*** failure in $file"; status=1; }
     fi
   done