sim: parse_args: polish getopt error message

The cris sim hit a few failures after the recent getopt logic, and the
expected output showed a few ways we can improve things to better match
other utils.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 97a170a584260a04b4fc6f80c6707532777a4f23..e0eebb2214e270c1bef18b6aa82a8a807e3397ac 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-options.c (sim_parse_args): Tweak getopt error message.
+
 2016-01-04  Mike Frysinger  <vapier@gentoo.org>
 
        * acinclude.m4 (sim-bswap): Delete.

diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index f662b734cfb8dd5775968aee71f1a8ec048a9a08..ad8b1eb29b83c6097283c4c4d0b35b3a1858385d 100644 (file)
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -616,7 +616,7 @@ sim_parse_args (SIM_DESC sd, char **argv)
            badopt = argv[optind - 1];
 
          sim_io_eprintf (sd,
-                         "%s: unrecognized option: %s\n"
+                         "%s: unrecognized option '%s'\n"
                          "Use --help for a complete list of options.\n",
                          STATE_MY_NAME (sd), badopt);
 

diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/sim/cris/ChangeLog
index fa3486353788b87817057289e880984081c84ad0..76dcec50ea8fef4656960c08202c61f807b74245 100644 (file)
--- a/sim/testsuite/sim/cris/ChangeLog
+++ b/sim/testsuite/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+       * asm/opterr1.ms: Update expected output.
+       * asm/opterr2.ms: Likewise.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
        * asm/io1.ms: Update expected output.

diff --git a/sim/testsuite/sim/cris/asm/opterr1.ms b/sim/testsuite/sim/cris/asm/opterr1.ms
index 94118db620c768ced31d69051f1f2da5acfd7fd5..409f58b0c9d50e76c58207c291661dba150247ad 100644 (file)
--- a/sim/testsuite/sim/cris/asm/opterr1.ms
+++ b/sim/testsuite/sim/cris/asm/opterr1.ms
@@ -1,5 +1,5 @@
 # mach: crisv3 crisv8 crisv10 crisv32
 # xerror:
-# output: *: unrecognized option [`']--cris-stats=xyz'\n
+# output: *: unrecognized option [`']--cris-stats=xyz'\nUse --help for a complete list of options.\n
 # sim: --cris-stats=xyz
  .include "nopv32t.ms"

diff --git a/sim/testsuite/sim/cris/asm/opterr2.ms b/sim/testsuite/sim/cris/asm/opterr2.ms
index 129ad1d8d61bec94520d3ed2795d485e68255568..084d61ec58e3b3fbde77a788a774c28ea5e7131a 100644 (file)
--- a/sim/testsuite/sim/cris/asm/opterr2.ms
+++ b/sim/testsuite/sim/cris/asm/opterr2.ms
@@ -1,5 +1,5 @@
 # mach: crisv3 crisv8 crisv10 crisv32
 # xerror:
-# output: *: unrecognized option [`']--cris-xyz'\n
+# output: *: unrecognized option [`']--cris-xyz'\nUse --help for a complete list of options.\n
 # sim: --cris-xyz
  .include "nopv32t.ms"