sim: parse_args: polish getopt error message [committed]
Commit 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.
---
sim/common/ChangeLog | 4 ++++
sim/common/sim-options.c | 2 +-
sim/testsuite/sim/cris/ChangeLog | 5 +++++
sim/testsuite/sim/cris/asm/opterr1.ms | 2 +-
sim/testsuite/sim/cris/asm/opterr2.ms | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
@@ -1,5 +1,9 @@
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.
* configure: Regenerate.
* Make-common.in (SIM_BSWAP): Delete.
@@ -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);
@@ -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.
@@ -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"
@@ -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"