Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 16.11.5
[deb_dpdk.git]
/
app
/
test
/
test_table.c
diff --git
a/app/test/test_table.c
b/app/test/test_table.c
index
1faa0a6
..
31eac11
100644
(file)
--- a/
app/test/test_table.c
+++ b/
app/test/test_table.c
@@
-82,6
+82,14
@@
uint64_t pipeline_test_hash(void *key,
return signature;
}
return signature;
}
+static void
+app_free_resources(void) {
+ int i;
+ for (i = 0; i < N_PORTS; i++)
+ rte_ring_free(rings_rx[i]);
+ rte_mempool_free(pool);
+}
+
static void
app_init_mbuf_pools(void)
{
static void
app_init_mbuf_pools(void)
{
@@
-141,18
+149,20
@@
app_init_rings(void)
static int
test_table(void)
{
static int
test_table(void)
{
- int status,
failures
;
+ int status,
ret
;
unsigned i;
unsigned i;
-
failures = 0
;
+
ret = TEST_SUCCESS
;
app_init_rings();
app_init_mbuf_pools();
printf("\n\n\n\n************Pipeline tests************\n");
app_init_rings();
app_init_mbuf_pools();
printf("\n\n\n\n************Pipeline tests************\n");
- if (test_table_pipeline() < 0)
- return -1;
+ if (test_table_pipeline() < 0) {
+ ret = TEST_FAILED;
+ goto end;
+ }
printf("\n\n\n\n************Port tests************\n");
for (i = 0; i < n_port_tests; i++) {
printf("\n\n\n\n************Port tests************\n");
for (i = 0; i < n_port_tests; i++) {
@@
-160,8
+170,8
@@
test_table(void)
if (status < 0) {
printf("\nPort test number %d failed (%d).\n", i,
status);
if (status < 0) {
printf("\nPort test number %d failed (%d).\n", i,
status);
-
failures++
;
-
return -1
;
+
ret = TEST_FAILED
;
+
goto end
;
}
}
}
}
@@
-171,8
+181,8
@@
test_table(void)
if (status < 0) {
printf("\nTable test number %d failed (%d).\n", i,
status);
if (status < 0) {
printf("\nTable test number %d failed (%d).\n", i,
status);
-
failures++
;
-
return -1
;
+
ret = TEST_FAILED
;
+
goto end
;
}
}
}
}
@@
-182,21
+192,23
@@
test_table(void)
if (status < 0) {
printf("\nCombined table test number %d failed with "
"reason number %d.\n", i, status);
if (status < 0) {
printf("\nCombined table test number %d failed with "
"reason number %d.\n", i, status);
-
failures++
;
-
return -1
;
+
ret = TEST_FAILED
;
+
goto end
;
}
}
}
}
- if (failures)
- return -1;
-
#ifdef RTE_LIBRTE_ACL
printf("\n\n\n\n************ACL tests************\n");
#ifdef RTE_LIBRTE_ACL
printf("\n\n\n\n************ACL tests************\n");
- if (test_table_acl() < 0)
- return -1;
+ if (test_table_acl() < 0) {
+ ret = TEST_FAILED;
+ goto end;
+ }
#endif
#endif
- return 0;
+end:
+ app_free_resources();
+
+ return ret;
}
REGISTER_TEST_COMMAND(table_autotest, test_table);
}
REGISTER_TEST_COMMAND(table_autotest, test_table);