diff options
author | Matias Elo <matias.elo@nokia.com> | 2020-11-04 15:48:27 +0200 |
---|---|---|
committer | Petri Savolainen <petri.savolainen@nokia.com> | 2020-11-19 09:49:08 +0200 |
commit | cbd8e213e52c172f177a6ff94246078fd99b9865 (patch) | |
tree | 70955020dc8de74958f9edef71653ea1fe13ffc2 /test/validation | |
parent | 19ef5538b5a1e1a175d9b871dfbb8631c21c291c (diff) |
validation: classification: replace fprintf calls with ODPH_ERR
Direct print to stderr should be avoided. Update error prints to use
ODPH_ERR macro.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Diffstat (limited to 'test/validation')
3 files changed, 17 insertions, 16 deletions
diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index d2d15016d..783c59ce8 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -46,7 +46,7 @@ odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool, if (pktio == ODP_PKTIO_INVALID) { ret = odp_pool_destroy(pool); if (ret) - fprintf(stderr, "unable to destroy pool.\n"); + ODPH_ERR("Unable to destroy pool\n"); return ODP_PKTIO_INVALID; } @@ -56,12 +56,12 @@ odp_pktio_t create_pktio(odp_queue_type_t q_type, odp_pool_t pool, pktin_param.hash_enable = false; if (odp_pktin_queue_config(pktio, &pktin_param)) { - fprintf(stderr, "pktin queue config failed.\n"); + ODPH_ERR("Pktin queue config failed\n"); return ODP_PKTIO_INVALID; } if (odp_pktout_queue_config(pktio, NULL)) { - fprintf(stderr, "pktout queue config failed.\n"); + ODPH_ERR("Pktout queue config failed\n"); return ODP_PKTIO_INVALID; } @@ -73,7 +73,7 @@ int stop_pktio(odp_pktio_t pktio) odp_event_t ev; if (odp_pktio_stop(pktio)) { - fprintf(stderr, "pktio stop failed.\n"); + ODPH_ERR("Pktio stop failed\n"); return -1; } diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c index 45e1695b2..7ef8218a8 100644 --- a/test/validation/api/classification/odp_classification_test_pmr.c +++ b/test/validation/api/classification/odp_classification_test_pmr.c @@ -8,6 +8,7 @@ #include "odp_classification_testsuites.h" #include "classification.h" #include <odp_cunit_common.h> +#include <odp/helper/odph_api.h> #define MAX_NUM_UDP 4 #define MARK_IP 1 @@ -25,13 +26,13 @@ int classification_suite_pmr_init(void) memset(&cls_capa, 0, sizeof(odp_cls_capability_t)); if (odp_cls_capability(&cls_capa)) { - fprintf(stderr, "Classifier capability call failed.\n"); + ODPH_ERR("Classifier capability call failed\n"); return -1; } pkt_pool = pool_create("classification_pmr_pool"); if (ODP_POOL_INVALID == pkt_pool) { - fprintf(stderr, "Packet pool creation failed.\n"); + ODPH_ERR("Packet pool creation failed\n"); return -1; } @@ -47,7 +48,7 @@ int classification_suite_pmr_init(void) static int start_pktio(odp_pktio_t pktio) { if (odp_pktio_start(pktio)) { - fprintf(stderr, "unable to start loop\n"); + ODPH_ERR("Unable to start loop\n"); return -1; } @@ -92,7 +93,7 @@ int classification_suite_pmr_term(void) int ret = 0; if (0 != odp_pool_destroy(pkt_pool)) { - fprintf(stderr, "pkt_pool destroy failed.\n"); + ODPH_ERR("Packet pool destroy failed\n"); ret += -1; } diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c index 30caeb165..30321dab8 100644 --- a/test/validation/api/classification/odp_classification_tests.c +++ b/test/validation/api/classification/odp_classification_tests.c @@ -49,7 +49,7 @@ static int classification_suite_common_init(odp_bool_t enable_pktv) pool_default = pool_create("classification_pool"); if (ODP_POOL_INVALID == pool_default) { - fprintf(stderr, "Packet pool creation failed.\n"); + ODPH_ERR("Packet pool creation failed\n"); return -1; } @@ -60,7 +60,7 @@ static int classification_suite_common_init(odp_bool_t enable_pktv) if (pktio_loop == ODP_PKTIO_INVALID) { ret = odp_pool_destroy(pool_default); if (ret) - fprintf(stderr, "unable to destroy pool.\n"); + ODPH_ERR("Unable to destroy pool\n"); return -1; } @@ -111,12 +111,12 @@ static int classification_suite_common_init(odp_bool_t enable_pktv) } if (odp_pktin_queue_config(pktio_loop, &pktin_param)) { - fprintf(stderr, "pktin queue config failed.\n"); + ODPH_ERR("Pktin queue config failed\n"); return -1; } if (odp_pktout_queue_config(pktio_loop, NULL)) { - fprintf(stderr, "pktout queue config failed.\n"); + ODPH_ERR("Pktout queue config failed\n"); return -1; } @@ -136,7 +136,7 @@ static int classification_suite_common_init(odp_bool_t enable_pktv) ret = odp_pktio_start(pktio_loop); if (ret) { - fprintf(stderr, "unable to start loop\n"); + ODPH_ERR("Unable to start loop\n"); return -1; } @@ -149,17 +149,17 @@ static int classification_suite_common_term(odp_bool_t enable_pktv) int retcode = 0; if (0 > stop_pktio(pktio_loop)) { - fprintf(stderr, "stop pktio failed.\n"); + ODPH_ERR("Stop pktio failed\n"); retcode = -1; } if (0 > odp_pktio_close(pktio_loop)) { - fprintf(stderr, "pktio close failed.\n"); + ODPH_ERR("Pktio close failed\n"); retcode = -1; } if (0 != odp_pool_destroy(pool_default)) { - fprintf(stderr, "pool_default destroy failed.\n"); + ODPH_ERR("Pool_default destroy failed\n"); retcode = -1; } |