Rename --test and --noverify to --test-memory and -d --noverify-memory

Author: MCUdude

src/avrdude.1

@@ -40,7 +40,7 @@
 .Op Fl F
 .Op Fl i Ar delay
 .Op Fl l, \-logfile Ar logfile
-.Op Fl n, \-test
+.Op Fl n, \-test-memory
 .Op Fl O, \-osccal 
 .Op Fl P, \-port Ar port
 .Op Fl r, \-reconnect
@@ -50,7 +50,7 @@
 .Op Fl U, \-memory Ar memory:op:filename:filefmt
 .Op Fl v, \-verbose
 .Op Fl x Ar extended_param
-.Op Fl V, \-noverify
+.Op Fl V, \-noverify-memory
 .Sh DESCRIPTION
 .Nm Avrdude
 is a program for downloading and uploading on-chip memories of Atmel AVR
@@ -580,7 +580,7 @@ Note that initial diagnostic messages (during option parsing) are still
 written to
 .Va stderr
 anyway.
-.It Fl n \-test
+.It Fl n \-test-memory
 No-write: disables writing data to the MCU whilst processing -U
 (useful for debugging
 .Nm avrdude
@@ -931,7 +931,7 @@ Enable verbose output.
 More
 .Fl v
 options increase verbosity level.
-.It Fl V \-noverify
+.It Fl V \-noverify-memory
 Disable automatic verify check when writing data to the AVR with -U.
 .It Fl x Ar extended_param
 Pass

src/doc/avrdude.texi

@@ -764,9 +764,9 @@ Note that initial diagnostic messages (during option parsing) are still
 written to @var{stderr} anyway.
 
 @item -n
-@item --test
-@cindex Option @code{-n, --test}
-@cindex @code{-n, --test}
+@item --test-memory
+@cindex Option @code{-n, --test-memory}
+@cindex @code{-n, --test-memory}
 No-write: disables writing data to the MCU whilst processing @code{-U}
 (useful for debugging AVRDUDE). The terminal mode continues to write to
 the device.
@@ -1100,9 +1100,9 @@ Enable verbose output.
 More @code{-v} options increase verbosity level.
 
 @item -V
-@item --noverify
-@cindex Option @code{-V, --noverify}
-@cindex @code{-V, --noverify}
+@item --noverify-memory
+@cindex Option @code{-V, --noverify-memory}
+@cindex @code{-V, --noverify-memory}
 Disable automatic verify check when writing data to the AVR with @code{-U}.
 
 @item -x @var{extended_param}

src/main.c

@@ -268,8 +268,8 @@ static void usage(void) {
     "  -U, --memory <memstr>:r|w|v:<filename>[:format]\n"
     "                            Carry out memory operation when it is its turn\n"
     "                            Multiple -t, -T and -U options can be specified\n"
-    "  -n, --test                Do not write to the device whilst processing -U\n"
-    "  -V, --noverify            Do not automatically verify during -U\n"
+    "  -n, --test-memory         Do not write to the device whilst processing -U\n"
+    "  -V, --noverify-memory     Do not automatically verify during -U\n"
     "  -E <exitsp>[,<exitsp>]    List programmer exit specifications\n"
     "  -x <extended_param>       Pass <extended_param> to programmer, see -x help\n"
     "  -v, --verbose             Verbose output; -v -v for more\n"
@@ -829,7 +829,7 @@ int main(int argc, char *argv[]) {
     {"noerase",    no_argument,       NULL, 'D'},
     {"erase",      no_argument,       NULL, 'e'},
     {"logfile",    required_argument, NULL, 'l'},
-    {"test",       no_argument,       NULL, 'n'},
+    {"test-memory",no_argument,       NULL, 'n'},
     {"noconfig",   no_argument,       NULL, 'N'},
     {"osccal",     no_argument,       NULL, 'O'},
     {"part",       required_argument, NULL, 'p'},
@@ -839,7 +839,7 @@ int main(int argc, char *argv[]) {
     {"terminal",   no_argument,       NULL, 't'},
     {"memory",     required_argument, NULL, 'U'},
     {"verbose",    no_argument,       NULL, 'v'},
-    {"noverify",   no_argument,       NULL, 'V'},
+    {"noverify-memory",no_argument,   NULL, 'V'},
     {NULL,         0,                 NULL, 0}
   };
   while((ch = getopt_long(argc, argv,