aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Uvarov <maxim.uvarov@linaro.org>2016-10-14 14:23:58 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2016-10-14 14:24:08 +0300
commit79833e86ea0be9e1f337dd4baff096bce7067b51 (patch)
tree4d9cbecdb18c3c28c6c258ee9b4a30eb37de38da
parentbf9380296de8cd62c0a8569c1fc775869b8501ab (diff)
Revert "test: skip pktio_perf tests on 1 and 2 cpus machines"
This reverts commit bf9380296de8cd62c0a8569c1fc775869b8501ab. Patch has logic break of original code. if (ret) break is not correct statement. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--test/common_plat/performance/odp_pktio_perf.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c
index 846dfaa88..f041b1325 100644
--- a/test/common_plat/performance/odp_pktio_perf.c
+++ b/test/common_plat/performance/odp_pktio_perf.c
@@ -34,8 +34,6 @@
#include <inttypes.h>
#include <test_debug.h>
-#define TEST_SKIP 77
-
#define PKT_BUF_NUM 8192
#define MAX_NUM_IFACES 2
#define TEST_HDR_MAGIC 0x92749451
@@ -560,7 +558,7 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx,
gbl_args->args.cpu_count);
if (num_workers < 2) {
LOG_ERR("Need at least two cores\n");
- return TEST_SKIP;
+ return -1;
}
if (gbl_args->args.num_tx_workers) {
@@ -671,9 +669,8 @@ static int run_test(void)
.warmup = 1,
};
- ret = setup_txrx_masks(&txmask, &rxmask);
- if (ret)
- return ret;
+ if (setup_txrx_masks(&txmask, &rxmask) != 0)
+ return -1;
printf("Starting test with params:\n");
printf("\tTransmit workers: \t%d\n", odp_cpumask_count(&txmask));
@@ -694,11 +691,8 @@ static int run_test(void)
run_test_single(&txmask, &rxmask, &status);
status.warmup = 0;
- while (1) {
+ while (ret > 0)
ret = run_test_single(&txmask, &rxmask, &status);
- if (ret)
- break;
- }
return ret;
}