do not show -v option twice in -h

This commit is contained in:
Christian Grothoff 2017-06-11 11:51:55 +02:00
parent 30f1d7b244
commit 0ef7116ecf
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 14 additions and 11 deletions

View File

@ -389,7 +389,6 @@ main (int argc,
"PLUGINNAME", "PLUGINNAME",
"which wire plugin to use", "which wire plugin to use",
&type), &type),
GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_OPTION_END GNUNET_GETOPT_OPTION_END
}; };

View File

@ -485,7 +485,7 @@ interpreter (void *cls)
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"taler-exchange-wirewatch", "taler-exchange-wirewatch",
"-c", config_filename, "-c", config_filename,
"-t", /* enable temporary tables */ "-t", "test",
NULL); NULL);
if (NULL == cmd->details.wirewatch.wirewatch_proc) if (NULL == cmd->details.wirewatch.wirewatch_proc)
{ {
@ -554,20 +554,26 @@ run (void *cls)
{ {
static struct Command commands[] = { static struct Command commands[] = {
/* test running with empty DB */ /* test running with empty DB */
{
.opcode = OPCODE_RUN_AGGREGATOR,
.label = "run-aggregator-on-empty-db"
},
{ {
.opcode = OPCODE_EXPECT_TRANSFERS_EMPTY, .opcode = OPCODE_EXPECT_TRANSFERS_EMPTY,
.label = "expect-empty-transactions-on-start" .label = "expect-empty-transactions-on-start"
}, },
{ {
.opcode = OPCODE_RUN_AGGREGATOR, .opcode = OPCODE_RUN_AGGREGATOR,
.label = "run-aggregator-deposit-1" .label = "run-aggregator-on-empty"
},
{
.opcode = OPCODE_RUN_WIREWATCH,
.label = "run-wirewatch-on-empty"
},
{
.opcode = OPCODE_EXPECT_TRANSFERS_EMPTY,
.label = "expect-empty-transactions-after-dry-run"
},
{
.opcode = OPCODE_TERMINATE_SUCCESS,
.label = "testcase-complete-terminating-with-success"
}, },
{ {
.opcode = OPCODE_EXPECT_TRANSFER, .opcode = OPCODE_EXPECT_TRANSFER,
.label = "expect-deposit-1", .label = "expect-deposit-1",
@ -576,12 +582,10 @@ run (void *cls)
.details.expect_transfer.exchange_base_url = "https://exchange.taler.net/", .details.expect_transfer.exchange_base_url = "https://exchange.taler.net/",
.details.expect_transfer.amount = "EUR:0.89" .details.expect_transfer.amount = "EUR:0.89"
}, },
{ {
.opcode = OPCODE_EXPECT_TRANSFERS_EMPTY, .opcode = OPCODE_EXPECT_TRANSFERS_EMPTY,
.label = "expect-empty-transactions-on-start" .label = "expect-empty-transactions-on-start"
}, },
{ {
.opcode = OPCODE_TERMINATE_SUCCESS, .opcode = OPCODE_TERMINATE_SUCCESS,
.label = "testcase-complete-terminating-with-success" .label = "testcase-complete-terminating-with-success"