diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-01-04 05:08:26 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-04 05:08:26 -0500 |
| commit | 8d7d784e23b5b2f8c7e28ece1bdb73b58199f16f (patch) | |
| tree | 63ee8b4214d5154200761718a5ca4e6e5484b5e2 /sim | |
| parent | 9bbf6f91c6e85ca916ec2c266009167f20f5ecfd (diff) | |
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.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/common/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/common/sim-options.c | 2 | ||||
| -rw-r--r-- | sim/testsuite/sim/cris/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/testsuite/sim/cris/asm/opterr1.ms | 2 | ||||
| -rw-r--r-- | sim/testsuite/sim/cris/asm/opterr2.ms | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 97a170a584..e0eebb2214 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -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. diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index f662b734cf..ad8b1eb29b 100644 --- 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 fa34863537..76dcec50ea 100644 --- 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 94118db620..409f58b0c9 100644 --- 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 129ad1d8d6..084d61ec58 100644 --- 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" |