diff options
| author |   Ricardo Salveti <ricardo.salveti@linaro.org> | 2016-07-25 13:22:22 -0300 |
|---|---|---|
| committer | Ricardo Salveti <ricardo.salveti@linaro.org> | 2016-07-25 13:26:13 -0300 |
| commit | 5b1ff351aa2d38446487eed6ccd7ace1b654bbe6 (patch) | |
| tree | 383fc0fb3c0906113cdbdc0268a32479ed8fa038 /app/test | |
| parent | fe9e0a156b8ec361b633b4d20d2231113f28fa63 (diff) | |
Imported Upstream version 16.07-rc4
Change-Id: Ic57f6a3726f2dbd1682223648d91310f45705327
Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>
Diffstat (limited to 'app/test')
| -rw-r--r-- | app/test/autotest_data.py | 4 | ||||
| -rw-r--r-- | app/test/autotest_runner.py | 8 | ||||
| -rw-r--r-- | app/test/test_mbuf.c | 2 | ||||
| -rw-r--r-- | app/test/test_mempool.c | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index c69705ed..defd46e8 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -158,7 +158,7 @@ parallel_test_group_list = [ }, { "Prefix": "group_3", - "Memory" : per_sockets(390), + "Memory" : per_sockets(512), "Tests" : [ { @@ -287,7 +287,7 @@ parallel_test_group_list = [ }, { "Prefix": "group_6", - "Memory" : per_sockets(128), + "Memory" : per_sockets(512), "Tests" : [ { diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py index bd99e19e..21d3be2c 100644 --- a/app/test/autotest_runner.py +++ b/app/test/autotest_runner.py @@ -107,8 +107,10 @@ def run_test_group(cmdline, test_group): # parse the binary for available test commands binary = cmdline.split()[0] - symbols = subprocess.check_output(['nm', binary]).decode('utf-8') - avail_cmds = re.findall('test_register_(\w+)', symbols) + stripped = 'not stripped' not in subprocess.check_output(['file', binary]) + if not stripped: + symbols = subprocess.check_output(['nm', binary]).decode('utf-8') + avail_cmds = re.findall('test_register_(\w+)', symbols) # run all tests in test group for test in test_group["Tests"]: @@ -129,7 +131,7 @@ def run_test_group(cmdline, test_group): print >>logfile, "\n%s %s\n" % ("-"*20, test["Name"]) # run test function associated with the test - if test["Command"] in avail_cmds: + if stripped or test["Command"] in avail_cmds: result = test["Func"](child, test["Command"]) else: result = (0, "Skipped [Not Available]") diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 684ad80f..c0823ea5 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -809,7 +809,7 @@ test_refcnt_mbuf(void) if (refcnt_mbuf_ring == NULL && (refcnt_mbuf_ring = rte_ring_create("refcnt_mbuf_ring", - REFCNT_RING_SIZE, SOCKET_ID_ANY, + rte_align32pow2(REFCNT_RING_SIZE), SOCKET_ID_ANY, RING_F_SP_ENQ)) == NULL) { printf("%s: cannot allocate " MAKE_STRING(refcnt_mbuf_ring) "\n", __func__); diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c index 46ad6702..3b21cf76 100644 --- a/app/test/test_mempool.c +++ b/app/test/test_mempool.c @@ -506,7 +506,6 @@ test_mempool(void) { struct rte_mempool *mp_cache = NULL; struct rte_mempool *mp_nocache = NULL; - struct rte_mempool *mp_ext = NULL; struct rte_mempool *mp_stack = NULL; rte_atomic32_init(&synchro); @@ -605,7 +604,7 @@ test_mempool(void) err: rte_mempool_free(mp_nocache); rte_mempool_free(mp_cache); - rte_mempool_free(mp_ext); + rte_mempool_free(mp_stack); return -1; } |