diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | example/l2fwd_simple/Makefile.am | 2 | ||||
| -rwxr-xr-x | example/l2fwd_simple/l2fwd_simple_run.sh | 2 | ||||
| -rw-r--r-- | example/l2fwd_simple/udp64.pcap (renamed from pcap/udp64.pcap) | bin | 7624 -> 7624 bytes | |||
| -rw-r--r-- | example/packet/Makefile.am | 2 | ||||
| -rwxr-xr-x | example/packet/pktio_run.sh | 2 | ||||
| -rw-r--r-- | example/packet/udp64.pcap | bin | 0 -> 7624 bytes | |||
| -rw-r--r-- | example/switch/Makefile.am | 2 | ||||
| -rwxr-xr-x | example/switch/switch_run.sh | 2 | ||||
| -rw-r--r-- | example/switch/udp64.pcap | bin | 0 -> 7624 bytes | |||
| -rw-r--r-- | pcap/Makefile.am | 1 |
12 files changed, 7 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index c1bd59446..212947260 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,8 +13,7 @@ SUBDIRS = @platform_with_platform@ \ helper/test \ doc \ example \ - scripts \ - pcap + scripts @DX_RULES@ diff --git a/configure.ac b/configure.ac index 1ef9739c2..7cd6670c9 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,6 @@ AC_CONFIG_FILES([Makefile pkgconfig/libodp-linux.pc pkgconfig/libodphelper-linux.pc scripts/Makefile - pcap/Makefile ]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/example/l2fwd_simple/Makefile.am b/example/l2fwd_simple/Makefile.am index 4cb546277..fe2065452 100644 --- a/example/l2fwd_simple/Makefile.am +++ b/example/l2fwd_simple/Makefile.am @@ -14,4 +14,4 @@ if HAVE_PCAP TESTS = l2fwd_simple_run.sh endif endif -EXTRA_DIST = l2fwd_simple_run.sh +EXTRA_DIST = l2fwd_simple_run.sh udp64.pcap diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index 7a49f5713..292d0e3e1 100755 --- a/example/l2fwd_simple/l2fwd_simple_run.sh +++ b/example/l2fwd_simple/l2fwd_simple_run.sh @@ -6,7 +6,7 @@ # SPDX-License-Identifier: BSD-3-Clause # -PCAP_IN=`find . ../../pcap -name udp64.pcap -print -quit` +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` echo "using PCAP_IN = ${PCAP_IN}" ./odp_l2fwd_simple pcap:in=${PCAP_IN} pcap:out=pcapout.pcap 02:00:00:00:00:01 02:00:00:00:00:02 & diff --git a/pcap/udp64.pcap b/example/l2fwd_simple/udp64.pcap Binary files differindex 45f9d6e63..45f9d6e63 100644 --- a/pcap/udp64.pcap +++ b/example/l2fwd_simple/udp64.pcap diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am index 4abd8efc1..af729b098 100644 --- a/example/packet/Makefile.am +++ b/example/packet/Makefile.am @@ -14,4 +14,4 @@ if HAVE_PCAP TESTS = pktio_run.sh endif endif -EXTRA_DIST = pktio_run.sh +EXTRA_DIST = pktio_run.sh udp64.pcap diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh index 5730c35fc..3adb2d62e 100755 --- a/example/packet/pktio_run.sh +++ b/example/packet/pktio_run.sh @@ -6,7 +6,7 @@ # SPDX-License-Identifier: BSD-3-Clause # -PCAP_IN=`find . ../../pcap -name udp64.pcap -print -quit` +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` 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}" diff --git a/example/packet/udp64.pcap b/example/packet/udp64.pcap Binary files differnew file mode 100644 index 000000000..45f9d6e63 --- /dev/null +++ b/example/packet/udp64.pcap diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am index fc5e9d066..4134bcf3d 100644 --- a/example/switch/Makefile.am +++ b/example/switch/Makefile.am @@ -14,4 +14,4 @@ if HAVE_PCAP TESTS = switch_run.sh endif endif -EXTRA_DIST = switch_run.sh +EXTRA_DIST = switch_run.sh udp64.pcap diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh index be0bd9df4..3f8f9db36 100755 --- a/example/switch/switch_run.sh +++ b/example/switch/switch_run.sh @@ -9,7 +9,7 @@ NUM_RX_PORT=3 RETVAL=0 -PCAP_IN=`find . ../../pcap -name udp64.pcap -print -quit` +PCAP_IN=`find . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` echo "Switch test using PCAP_IN = ${PCAP_IN}" diff --git a/example/switch/udp64.pcap b/example/switch/udp64.pcap Binary files differnew file mode 100644 index 000000000..45f9d6e63 --- /dev/null +++ b/example/switch/udp64.pcap diff --git a/pcap/Makefile.am b/pcap/Makefile.am deleted file mode 100644 index 31fc32ea2..000000000 --- a/pcap/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = udp64.pcap |