diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/common/odp_cunit_common.c | 3 | ||||
-rw-r--r-- | test/performance/odp_bench_packet.c | 4 | ||||
-rw-r--r-- | test/performance/odp_crypto.c | 4 | ||||
-rw-r--r-- | test/performance/odp_ipsec.c | 4 | ||||
-rw-r--r-- | test/performance/odp_l2fwd.c | 4 | ||||
-rw-r--r-- | test/performance/odp_pktio_ordered.c | 4 | ||||
-rw-r--r-- | test/performance/odp_pktio_perf.c | 4 | ||||
-rw-r--r-- | test/performance/odp_sched_latency.c | 3 | ||||
-rw-r--r-- | test/performance/odp_sched_pktio.c | 2 | ||||
-rw-r--r-- | test/performance/odp_scheduling.c | 3 |
10 files changed, 11 insertions, 24 deletions
diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c index 79c3df1ef..f7c9af43b 100644 --- a/test/common/odp_cunit_common.c +++ b/test/common/odp_cunit_common.c @@ -394,5 +394,6 @@ int odp_cunit_register(odp_suiteinfo_t testsuites[]) int odp_cunit_parse_options(int argc, char *argv[]) { progname = argv[0]; - return odph_parse_options(argc, argv, NULL, NULL); + odph_parse_options(argc, argv); + return 0; } diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c index df41b41f4..b4f1905a9 100644 --- a/test/performance/odp_bench_packet.c +++ b/test/performance/odp_bench_packet.c @@ -1318,9 +1318,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "b:i:h"; /* Let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); - - opterr = 0; /* Do not issue errors on helper options */ + argc = odph_parse_options(argc, argv); appl_args->bench_idx = 0; /* Run all benchmarks */ appl_args->burst_size = TEST_DEF_BURST; diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0404aca25..61da80e8a 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -1197,7 +1197,7 @@ static void parse_args(int argc, char *argv[], crypto_args_t *cargs) static const char *shortopts = "+a:c:df:hi:m:nl:spr"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); cargs->in_place = 0; cargs->in_flight = 1; @@ -1208,8 +1208,6 @@ static void parse_args(int argc, char *argv[], crypto_args_t *cargs) cargs->reuse_packet = 0; cargs->schedule = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c index 587293dbe..551c021af 100644 --- a/test/performance/odp_ipsec.c +++ b/test/performance/odp_ipsec.c @@ -929,7 +929,7 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) static const char *shortopts = "+a:c:df:hi:m:nl:sptu"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); cargs->in_place = 0; cargs->in_flight = 1; @@ -940,8 +940,6 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs) cargs->schedule = 0; cargs->ah = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 2859000d5..ff14ab2f8 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -1184,7 +1184,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:k:g:vh"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = 1; /* get and print pps stats second */ @@ -1195,8 +1195,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->verbose = 0; appl_args->chksum = 0; /* don't use checksum offload by default */ - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index 5647b1eb5..ec6c4faa3 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -868,7 +868,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) static const char *shortopts = "+c:+t:+a:i:m:d:r:f:e:h"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); appl_args->time = 0; /* loop forever if time to run is 0 */ appl_args->accuracy = DEF_STATS_INT; @@ -876,8 +876,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) appl_args->num_flows = DEF_NUM_FLOWS; appl_args->extra_rounds = DEF_EXTRA_ROUNDS; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 75f4abf24..2791856aa 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -961,7 +961,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:t:b:pR:l:r:i:d:vh"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); args->cpu_count = 0; /* all CPUs */ args->num_tx_workers = 0; /* defaults to cpu_count+1/2 */ @@ -973,8 +973,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) args->schedule = 1; args->verbose = 0; - opterr = 0; /* do not issue errors on helper options */ - while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c index ca7201193..7e98db184 100644 --- a/test/performance/odp_sched_latency.c +++ b/test/performance/odp_sched_latency.c @@ -550,7 +550,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:s:l:t:m:n:o:p:rh"; /* Let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); args->sync_type = ODP_SCHED_SYNC_PARALLEL; args->sample_per_prio = SAMPLE_EVENT_PER_PRIO; @@ -561,7 +561,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) args->prio[LO_PRIO].events_per_queue = EVENTS_PER_LO_PRIO_QUEUE; args->prio[HI_PRIO].events_per_queue = EVENTS_PER_HI_PRIO_QUEUE; - opterr = 0; /* Do not issue errors on helper options */ while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c index 46a08c925..109ae87e2 100644 --- a/test/performance/odp_sched_pktio.c +++ b/test/performance/odp_sched_pktio.c @@ -364,7 +364,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) test_options->num_pktio_queue = 0; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 6b7cff77c..8dd86c3c3 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -761,9 +761,8 @@ static void parse_args(int argc, char *argv[], test_args_t *args) static const char *shortopts = "+c:fh"; /* let helper collect its own arguments (e.g. --odph_proc) */ - odph_parse_options(argc, argv, shortopts, longopts); + argc = odph_parse_options(argc, argv); - opterr = 0; /* do not issue errors on helper options */ while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); |