aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform/linux-generic/odp_init.c5
-rwxr-xr-xplatform/linux-generic/test/pktio/pktio_run3
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 062095ab7..ea9974287 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -29,7 +29,10 @@ int odp_init_global(const odp_init_t *params,
return -1;
}
- odp_system_info_init();
+ if (odp_system_info_init()) {
+ ODP_ERR("ODP system_info init failed.\n");
+ return -1;
+ }
if (odp_shm_init_global()) {
ODP_ERR("ODP shm init failed.\n");
diff --git a/platform/linux-generic/test/pktio/pktio_run b/platform/linux-generic/test/pktio/pktio_run
index 3c48233d1..7029ab207 100755
--- a/platform/linux-generic/test/pktio/pktio_run
+++ b/platform/linux-generic/test/pktio/pktio_run
@@ -52,6 +52,9 @@ run_test()
unset ODP_PKTIO_DISABLE_SOCKET_${distype}
done
+ # this script doesn't support testing with netmap
+ export ODP_PKTIO_DISABLE_NETMAP=y
+
for distype in SKIP MMAP; do
if [ "$disabletype" != "SKIP" ]; then
export ODP_PKTIO_DISABLE_SOCKET_${distype}=y