diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/test/meson.build | 3 | ||||
-rw-r--r-- | test/test/test_cryptodev_blockcipher.c | 5 | ||||
-rw-r--r-- | test/test/test_eal_flags.c | 67 | ||||
-rw-r--r-- | test/test/test_hash_readwrite.c | 12 | ||||
-rw-r--r-- | test/test/test_metrics.c | 2 |
5 files changed, 55 insertions, 34 deletions
diff --git a/test/test/meson.build b/test/test/meson.build index 554e9945..5a4816fe 100644 --- a/test/test/meson.build +++ b/test/test/meson.build @@ -39,6 +39,8 @@ test_sources = files('commands.c', 'test_event_eth_tx_adapter.c', 'test_event_timer_adapter.c', 'test_eventdev.c', + 'test_external_mem.c', + 'test_fbarray.c', 'test_func_reentrancy.c', 'test_flow_classify.c', 'test_hash.c', @@ -170,6 +172,7 @@ test_names = [ 'eventdev_octeontx_autotest', 'eventdev_sw_autotest', 'external_mem_autotest', + 'fbarray_autotest', 'func_reentrancy_autotest', 'flow_classify_autotest', 'hash_autotest', diff --git a/test/test/test_cryptodev_blockcipher.c b/test/test/test_cryptodev_blockcipher.c index 1c3f29f6..4f1298ea 100644 --- a/test/test/test_cryptodev_blockcipher.c +++ b/test/test/test_cryptodev_blockcipher.c @@ -401,13 +401,14 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t, /* Verify results */ if (op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) { - if (t->op_mask & BLOCKCIPHER_TEST_OP_AUTH_VERIFY) + if ((t->op_mask & BLOCKCIPHER_TEST_OP_AUTH_VERIFY) && + (op->status == RTE_CRYPTO_OP_STATUS_AUTH_FAILED)) snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN, "line %u " "FAILED: Digest verification failed " "(0x%X)", __LINE__, op->status); else snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN, "line %u " - "FAILED: Digest verification failed " + "FAILED: Operation failed " "(0x%X)", __LINE__, op->status); status = TEST_FAILED; goto error_exit; diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c index 2acab9d6..81e345b8 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -18,6 +18,7 @@ #include <sys/file.h> #include <limits.h> +#include <rte_per_lcore.h> #include <rte_debug.h> #include <rte_string_fns.h> @@ -477,40 +478,50 @@ test_missing_c_flag(void) "-n", "3", "-l", "1," }; const char *argv10[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1#2" }; + /* core number is negative value */ + const char * const argv11[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "-5" }; + const char * const argv12[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "-5-7" }; + /* core number is maximum value */ + const char * const argv13[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", RTE_STR(RTE_MAX_LCORE) }; + const char * const argv14[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "1-"RTE_STR(RTE_MAX_LCORE) }; /* sanity check test - valid corelist value */ - const char *argv11[] = { prgname, prefix, mp_flag, + const char * const argv15[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1-2,3" }; /* --lcores flag but no lcores value */ - const char *argv12[] = { prgname, prefix, mp_flag, + const char * const argv16[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores" }; - const char *argv13[] = { prgname, prefix, mp_flag, + const char * const argv17[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", " " }; /* bad lcores value */ - const char *argv14[] = { prgname, prefix, mp_flag, + const char * const argv18[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "1-3-5" }; - const char *argv15[] = { prgname, prefix, mp_flag, + const char * const argv19[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-1,,2" }; - const char *argv16[] = { prgname, prefix, mp_flag, + const char * const argv20[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-,1" }; - const char *argv17[] = { prgname, prefix, mp_flag, + const char * const argv21[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(0-,2-4)" }; - const char *argv18[] = { prgname, prefix, mp_flag, + const char * const argv22[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(-1,2)" }; - const char *argv19[] = { prgname, prefix, mp_flag, + const char * const argv23[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(2-4)@(2-4-6)" }; - const char *argv20[] = { prgname, prefix, mp_flag, + const char * const argv24[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(a,2)" }; - const char *argv21[] = { prgname, prefix, mp_flag, + const char * const argv25[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "1-3@(1,3)" }; - const char *argv22[] = { prgname, prefix, mp_flag, + const char * const argv26[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "3@((1,3)" }; - const char *argv23[] = { prgname, prefix, mp_flag, + const char * const argv27[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "(4-7)=(1,3)" }; - const char *argv24[] = { prgname, prefix, mp_flag, + const char * const argv28[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "[4-7]@(1,3)" }; /* sanity check of tests - valid lcores value */ - const char *argv25[] = { prgname, prefix, mp_flag, + const char * const argv29[] = { prgname, prefix, mp_flag, "-n", "3", "--lcores", "0-1,2@(5-7),(3-5)@(0,2),(0,6),7"}; @@ -538,31 +549,35 @@ test_missing_c_flag(void) || launch_proc(argv7) == 0 || launch_proc(argv8) == 0 || launch_proc(argv9) == 0 - || launch_proc(argv10) == 0) { + || launch_proc(argv10) == 0 + || launch_proc(argv11) == 0 + || launch_proc(argv12) == 0 + || launch_proc(argv13) == 0 + || launch_proc(argv14) == 0) { printf("Error - " "process ran without error with invalid -l flag\n"); return -1; } - if (launch_proc(argv11) != 0) { + if (launch_proc(argv15) != 0) { printf("Error - " "process did not run ok with valid corelist value\n"); return -1; } /* start --lcores tests */ - if (launch_proc(argv12) == 0 || launch_proc(argv13) == 0 || - launch_proc(argv14) == 0 || launch_proc(argv15) == 0 || - launch_proc(argv16) == 0 || launch_proc(argv17) == 0 || + if (launch_proc(argv16) == 0 || launch_proc(argv17) == 0 || launch_proc(argv18) == 0 || launch_proc(argv19) == 0 || launch_proc(argv20) == 0 || launch_proc(argv21) == 0 || - launch_proc(argv21) == 0 || launch_proc(argv22) == 0 || - launch_proc(argv23) == 0 || launch_proc(argv24) == 0) { + launch_proc(argv22) == 0 || launch_proc(argv23) == 0 || + launch_proc(argv24) == 0 || launch_proc(argv25) == 0 || + launch_proc(argv26) == 0 || launch_proc(argv27) == 0 || + launch_proc(argv28) == 0) { printf("Error - " "process ran without error with invalid --lcore flag\n"); return -1; } - if (launch_proc(argv25) != 0) { + if (launch_proc(argv29) != 0) { printf("Error - " "process did not run ok with valid corelist value\n"); return -1; @@ -1143,7 +1158,7 @@ test_memory_flags(void) const char *argv1[] = {prgname, "-c", "10", "-n", "2", "--file-prefix=" memtest, "-m", DEFAULT_MEM_SIZE}; - /* invalid (zero) --socket-mem flag */ + /* valid (zero) --socket-mem flag */ const char *argv2[] = {prgname, "-c", "10", "-n", "2", "--file-prefix=" memtest, "--socket-mem=0,0,0,0"}; @@ -1241,8 +1256,8 @@ test_memory_flags(void) printf("Error - process failed with valid -m flag!\n"); return -1; } - if (launch_proc(argv2) == 0) { - printf("Error - process run ok with invalid (zero) --socket-mem!\n"); + if (launch_proc(argv2) != 0) { + printf("Error - process failed with valid (zero) --socket-mem!\n"); return -1; } diff --git a/test/test/test_hash_readwrite.c b/test/test/test_hash_readwrite.c index 6b695ce6..480ae97d 100644 --- a/test/test/test_hash_readwrite.c +++ b/test/test/test_hash_readwrite.c @@ -39,7 +39,7 @@ static struct perf htm_results, non_htm_results; struct { uint32_t *keys; - uint32_t *found; + uint8_t *found; uint32_t num_insert; uint32_t rounded_tot_insert; struct rte_hash *h; @@ -126,7 +126,7 @@ init_params(int use_ext, int use_htm, int use_jhash) unsigned int i; uint32_t *keys = NULL; - uint32_t *found = NULL; + uint8_t *found = NULL; struct rte_hash *handle; struct rte_hash_parameters hash_params = { @@ -173,7 +173,7 @@ init_params(int use_ext, int use_htm, int use_jhash) goto err; } - found = rte_zmalloc(NULL, sizeof(uint32_t) * TOTAL_ENTRY, 0); + found = rte_zmalloc(NULL, sizeof(uint8_t) * TOTAL_ENTRY, 0); if (found == NULL) { printf("RTE_ZMALLOC failed\n"); goto err; @@ -361,7 +361,7 @@ test_hash_readwrite_perf(struct perf *perf_results, int use_htm, const void *next_key; void *next_data; - uint32_t iter = 0; + uint32_t iter; int use_jhash = 0; uint32_t duplicated_keys = 0; @@ -536,6 +536,8 @@ test_hash_readwrite_perf(struct perf *perf_results, int use_htm, rte_eal_mp_wait_lcore(); + iter = 0; + memset(tbl_rw_test_param.found, 0, TOTAL_ENTRY); while (rte_hash_iterate(tbl_rw_test_param.h, &next_key, &next_data, &iter) >= 0) { /* Search for the key in the list of keys added .*/ @@ -619,7 +621,7 @@ test_hash_readwrite_main(void) if (rte_lcore_count() <= 2) { printf("More than two lcores are required " "to do read write test\n"); - return 0; + return -1; } RTE_LCORE_FOREACH_SLAVE(core_id) { diff --git a/test/test/test_metrics.c b/test/test/test_metrics.c index 94d54d71..3c2f36b8 100644 --- a/test/test/test_metrics.c +++ b/test/test/test_metrics.c @@ -154,7 +154,7 @@ test_metrics_update_values(void) /* Failed Test: Invalid count size */ err = rte_metrics_update_values(RTE_METRICS_GLOBAL, - KEY, &value[0], 0); + KEY, &value[0], ARRAY_SIZE(value)); TEST_ASSERT(err < 0, "%s, %d", __func__, __LINE__); /* Failed Test: Invalid port_id(lower value) and valid data */ |