diff options
| author | Matias Elo <matias.elo@nokia.com> | 2020-09-09 16:18:07 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2020-09-11 13:22:01 +0300 |
| commit | 1b659c9f6bd6edaaa478eece39fa65430c1dea66 (patch) | |
| tree | e6c39e5d496f8742136077b33440a456a8d2ec06 | |
| parent | 0c434adf015e50893b92d1bc350cf44ae20cc939 (diff) | |
Port 091369b41 "build: use more generic naming for PCAP PKTIO test"
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
| -rwxr-xr-x | example/ping/ping_run.sh | 5 | ||||
| -rw-r--r-- | m4/odp_dpdk.m4 | 2 | ||||
| -rw-r--r-- | platform/linux-dpdk/m4/configure.m4 | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/example/ping/ping_run.sh b/example/ping/ping_run.sh index d61a352d0..fd14eac2c 100755 --- a/example/ping/ping_run.sh +++ b/example/ping/ping_run.sh @@ -11,8 +11,11 @@ PCAP_OUT="pcapout.pcap" PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}` echo "using PCAP in=${PCAP_IN}:out=${PCAP_OUT} size %${PCAP_IN_SIZE}" +export ODP_PLATFORM_PARAMS="--no-pci \ +--vdev net_pcap0,rx_pcap=${PCAP_IN},tx_pcap=${PCAP_OUT}" + # Ping test with 100 ICMP echo request packets (verbose mode) -./odp_ping${EXEEXT} -v -n 100 -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} +./odp_ping${EXEEXT} -v -n 100 -i0 STATUS=$? PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}` rm -f ${PCAP_OUT} diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 217d538ad..1890db8ef 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -28,7 +28,7 @@ if [[ -f "$1"/librte_pmd_pcap.a ]]; then have_pmd_pcap=yes fi AC_CONFIG_COMMANDS_PRE([dnl -AM_CONDITIONAL([HAVE_PMD_PCAP], [test x$have_pmd_pcap = xyes]) +AM_CONDITIONAL([ODP_PKTIO_PCAP], [test x$have_pmd_pcap = xyes]) ]) ]) diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index 1293d194d..8f77b8ec4 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -4,9 +4,6 @@ ODP_LIB_NAME="odp-linux" ODP_VISIBILITY ODP_ATOMIC -# linux-generic PCAP support is not relevant as the code doesn't use -# linux-generic pktio at all. And DPDK has its own PCAP support anyway -AM_CONDITIONAL([HAVE_PCAP], [false]) AM_CONDITIONAL([PKTIO_DPDK], [false]) ODP_PTHREAD ODP_TIMER |