| Message ID | 1463608400-10201-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | New |
| Headers | show |
After applying this pktio_run.sh passes, however the switch example fails:
bill@Ubuntu15:~/linaro/review/example/switch$ ./switch_run.sh
Switch test using PCAP_IN = ../../pcap/udp64.pcap
ODP system info
---------------
ODP API version: 1.10.0
ODP impl name: linux-generic
CPU model: Intel(R) Core(TM) i7-4790K CPU
CPU freq (hz): 4000000000
Cache line size: 64
CPU count: 4
Running ODP appl: "odp_switch"
-----------------
IF-count: 4
Using IFs: pcap:in=../../pcap/udp64.pcap pcap:out=pcapout1.pcap
pcap:out=pcapout2.pcap pcap:out=pcapout3.pcap
num worker threads: 2
first CPU: 2
cpu mask: 0xC
created pktio 1 (pcap:in=../../pcap/udp64.pcap)
Sharing 1 output queues between 2 workers
created 1 input and 1 output queues on (pcap:in=../../pcap/udp64.pcap)
created pktio 2 (pcap:out=pcapout1.pcap)
Sharing 1 output queues between 2 workers
created 1 input and 1 output queues on (pcap:out=pcapout1.pcap)
created pktio 3 (pcap:out=pcapout2.pcap)
Sharing 1 output queues between 2 workers
created 1 input and 1 output queues on (pcap:out=pcapout2.pcap)
created pktio 4 (pcap:out=pcapout3.pcap)
Sharing 1 output queues between 2 workers
created 1 input and 1 output queues on (pcap:out=pcapout3.pcap)
Worker mapping table (port[queue])
--------------------
Worker 0
0[0]
2[0]
Worker 1
1[0]
3[0]
Port config
--------------------
Port 0 (pcap:in=../../pcap/udp64.pcap)
rx workers 1
rx queues 1
tx queues 1
Port 1 (pcap:out=pcapout1.pcap)
rx workers 1
rx queues 1
tx queues 1
Port 2 (pcap:out=pcapout2.pcap)
rx workers 1
rx queues 1
tx queues 1
Port 3 (pcap:out=pcapout3.pcap)
rx workers 1
rx queues 1
tx queues 1
./switch_run.sh: line 26: 17723 Terminated ./odp_switch -i
pcap:in=${PCAP_IN}${RX_PORTS}
stat: cannot stat 'udp64.pcap': No such file or directory
./switch_run.sh: line 36: [: 7624: unary operator expected
stat: cannot stat 'udp64.pcap': No such file or directory
./switch_run.sh: line 36: [: 7624: unary operator expected
stat: cannot stat 'udp64.pcap': No such file or directory
./switch_run.sh: line 36: [: 7624: unary operator expected
On Wed, May 18, 2016 at 4:53 PM, Mike Holmes <mike.holmes@linaro.org> wrote:
> Examples should not duplicate pcap files
>
> Install the scripts and pcap file so that it can be run where it
> is installed after moving it to a common location in the repo
>
> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
> ---
> Makefile.am | 3 ++-
> configure.ac | 1 +
> example/l2fwd_simple/Makefile.am | 4 +++-
> example/l2fwd_simple/l2fwd_simple_run.sh | 2 +-
> example/l2fwd_simple/udp64.pcap | Bin 7624 -> 0 bytes
> example/packet/Makefile.am | 4 +++-
> example/packet/pktio_run.sh | 2 +-
> example/packet/udp64.pcap | Bin 7624 -> 0 bytes
> example/switch/Makefile.am | 4 +++-
> example/switch/switch_run.sh | 2 +-
> example/switch/udp64.pcap | Bin 7624 -> 0 bytes
> pcap/Makefile.am | 3 +++
> pcap/udp64.pcap | Bin 0 -> 7624 bytes
> 13 files changed, 18 insertions(+), 7 deletions(-)
> delete mode 100644 example/l2fwd_simple/udp64.pcap
> delete mode 100644 example/packet/udp64.pcap
> delete mode 100644 example/switch/udp64.pcap
> create mode 100644 pcap/Makefile.am
> create mode 100644 pcap/udp64.pcap
>
> diff --git a/Makefile.am b/Makefile.am
> index 2129472..c1bd594 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -13,7 +13,8 @@ SUBDIRS = @platform_with_platform@ \
> helper/test \
> doc \
> example \
> - scripts
> + scripts \
> + pcap
>
> @DX_RULES@
>
> diff --git a/configure.ac b/configure.ac
> index 7cd6670..1ef9739 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -232,6 +232,7 @@ 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 fe20654..ca87d49 100644
> --- a/example/l2fwd_simple/Makefile.am
> +++ b/example/l2fwd_simple/Makefile.am
> @@ -9,9 +9,11 @@ noinst_HEADERS = \
>
> dist_odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c
>
> +dist_bin_SCRIPTS = l2fwd_simple_run.sh
> +
> if test_example
> if HAVE_PCAP
> TESTS = l2fwd_simple_run.sh
> endif
> endif
> -EXTRA_DIST = l2fwd_simple_run.sh udp64.pcap
> +EXTRA_DIST = l2fwd_simple_run.sh
> diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh
> b/example/l2fwd_simple/l2fwd_simple_run.sh
> index 6050360..d88fdf6 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit`
> +PCAP_IN=`find . ../../pcap -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/example/l2fwd_simple/udp64.pcap
> b/example/l2fwd_simple/udp64.pcap
> deleted file mode 100644
> index
> 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 7624
> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP
> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY
> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT
> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O&
>
> diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am
> index af729b0..811b21a 100644
> --- a/example/packet/Makefile.am
> +++ b/example/packet/Makefile.am
> @@ -9,9 +9,11 @@ noinst_HEADERS = \
>
> dist_odp_pktio_SOURCES = odp_pktio.c
>
> +dist_bin_SCRIPTS = pktio_run.sh
> +
> if test_example
> if HAVE_PCAP
> TESTS = pktio_run.sh
> endif
> endif
> -EXTRA_DIST = pktio_run.sh udp64.pcap
> +EXTRA_DIST = pktio_run.sh
> diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh
> index 3adb2d6..c5860d1 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit`
> +PCAP_IN=`find ../../pcap -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
> deleted file mode 100644
> index
> 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 7624
> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP
> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY
> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT
> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O&
>
> diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am
> index 4134bcf..047e8ca 100644
> --- a/example/switch/Makefile.am
> +++ b/example/switch/Makefile.am
> @@ -9,9 +9,11 @@ noinst_HEADERS = \
>
> dist_odp_switch_SOURCES = odp_switch.c
>
> +dist_bin_SCRIPTS = switch_run.sh
> +
> if test_example
> if HAVE_PCAP
> TESTS = switch_run.sh
> endif
> endif
> -EXTRA_DIST = switch_run.sh udp64.pcap
> +EXTRA_DIST = switch_run.sh
> diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh
> index 9b32973..238564f 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit`
> +PCAP_IN=`find . ../../pcap -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
> deleted file mode 100644
> index
> 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 7624
> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP
> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY
> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT
> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O&
>
> diff --git a/pcap/Makefile.am b/pcap/Makefile.am
> new file mode 100644
> index 0000000..c4770b6
> --- /dev/null
> +++ b/pcap/Makefile.am
> @@ -0,0 +1,3 @@
> +EXTRA_DIST = udp64.pcap
> +
> +dist_bin_SCRIPTS = udp64.pcap
> diff --git a/pcap/udp64.pcap b/pcap/udp64.pcap
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..45f9d6e6341a331125e1e3e49ab8ad1e71b20712
> GIT binary patch
> literal 7624
> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP
> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY
> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT
> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O&
>
> literal 0
> HcmV?d00001
>
> --
> 2.7.4
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
>
Thanks, I will take a look. On 19 May 2016 at 19:48, Bill Fischofer <bill.fischofer@linaro.org> wrote: > After applying this pktio_run.sh passes, however the switch example fails: > > bill@Ubuntu15:~/linaro/review/example/switch$ ./switch_run.sh > Switch test using PCAP_IN = ../../pcap/udp64.pcap > > ODP system info > --------------- > ODP API version: 1.10.0 > ODP impl name: linux-generic > CPU model: Intel(R) Core(TM) i7-4790K CPU > CPU freq (hz): 4000000000 > Cache line size: 64 > CPU count: 4 > > Running ODP appl: "odp_switch" > ----------------- > IF-count: 4 > Using IFs: pcap:in=../../pcap/udp64.pcap pcap:out=pcapout1.pcap > pcap:out=pcapout2.pcap pcap:out=pcapout3.pcap > > num worker threads: 2 > first CPU: 2 > cpu mask: 0xC > created pktio 1 (pcap:in=../../pcap/udp64.pcap) > Sharing 1 output queues between 2 workers > created 1 input and 1 output queues on (pcap:in=../../pcap/udp64.pcap) > created pktio 2 (pcap:out=pcapout1.pcap) > Sharing 1 output queues between 2 workers > created 1 input and 1 output queues on (pcap:out=pcapout1.pcap) > created pktio 3 (pcap:out=pcapout2.pcap) > Sharing 1 output queues between 2 workers > created 1 input and 1 output queues on (pcap:out=pcapout2.pcap) > created pktio 4 (pcap:out=pcapout3.pcap) > Sharing 1 output queues between 2 workers > created 1 input and 1 output queues on (pcap:out=pcapout3.pcap) > > Worker mapping table (port[queue]) > -------------------- > Worker 0 > 0[0] > 2[0] > Worker 1 > 1[0] > 3[0] > > Port config > -------------------- > Port 0 (pcap:in=../../pcap/udp64.pcap) > rx workers 1 > rx queues 1 > tx queues 1 > Port 1 (pcap:out=pcapout1.pcap) > rx workers 1 > rx queues 1 > tx queues 1 > Port 2 (pcap:out=pcapout2.pcap) > rx workers 1 > rx queues 1 > tx queues 1 > Port 3 (pcap:out=pcapout3.pcap) > rx workers 1 > rx queues 1 > tx queues 1 > > ./switch_run.sh: line 26: 17723 Terminated ./odp_switch -i > pcap:in=${PCAP_IN}${RX_PORTS} > stat: cannot stat 'udp64.pcap': No such file or directory > ./switch_run.sh: line 36: [: 7624: unary operator expected > stat: cannot stat 'udp64.pcap': No such file or directory > ./switch_run.sh: line 36: [: 7624: unary operator expected > stat: cannot stat 'udp64.pcap': No such file or directory > ./switch_run.sh: line 36: [: 7624: unary operator expected > > > On Wed, May 18, 2016 at 4:53 PM, Mike Holmes <mike.holmes@linaro.org> > wrote: > >> Examples should not duplicate pcap files >> >> Install the scripts and pcap file so that it can be run where it >> is installed after moving it to a common location in the repo >> >> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> >> --- >> Makefile.am | 3 ++- >> configure.ac | 1 + >> example/l2fwd_simple/Makefile.am | 4 +++- >> example/l2fwd_simple/l2fwd_simple_run.sh | 2 +- >> example/l2fwd_simple/udp64.pcap | Bin 7624 -> 0 bytes >> example/packet/Makefile.am | 4 +++- >> example/packet/pktio_run.sh | 2 +- >> example/packet/udp64.pcap | Bin 7624 -> 0 bytes >> example/switch/Makefile.am | 4 +++- >> example/switch/switch_run.sh | 2 +- >> example/switch/udp64.pcap | Bin 7624 -> 0 bytes >> pcap/Makefile.am | 3 +++ >> pcap/udp64.pcap | Bin 0 -> 7624 bytes >> 13 files changed, 18 insertions(+), 7 deletions(-) >> delete mode 100644 example/l2fwd_simple/udp64.pcap >> delete mode 100644 example/packet/udp64.pcap >> delete mode 100644 example/switch/udp64.pcap >> create mode 100644 pcap/Makefile.am >> create mode 100644 pcap/udp64.pcap >> >> diff --git a/Makefile.am b/Makefile.am >> index 2129472..c1bd594 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -13,7 +13,8 @@ SUBDIRS = @platform_with_platform@ \ >> helper/test \ >> doc \ >> example \ >> - scripts >> + scripts \ >> + pcap >> >> @DX_RULES@ >> >> diff --git a/configure.ac b/configure.ac >> index 7cd6670..1ef9739 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -232,6 +232,7 @@ 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 fe20654..ca87d49 100644 >> --- a/example/l2fwd_simple/Makefile.am >> +++ b/example/l2fwd_simple/Makefile.am >> @@ -9,9 +9,11 @@ noinst_HEADERS = \ >> >> dist_odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c >> >> +dist_bin_SCRIPTS = l2fwd_simple_run.sh >> + >> if test_example >> if HAVE_PCAP >> TESTS = l2fwd_simple_run.sh >> endif >> endif >> -EXTRA_DIST = l2fwd_simple_run.sh udp64.pcap >> +EXTRA_DIST = l2fwd_simple_run.sh >> diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh >> b/example/l2fwd_simple/l2fwd_simple_run.sh >> index 6050360..d88fdf6 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` >> +PCAP_IN=`find . ../../pcap -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/example/l2fwd_simple/udp64.pcap >> b/example/l2fwd_simple/udp64.pcap >> deleted file mode 100644 >> index >> 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000 >> GIT binary patch >> literal 0 >> HcmV?d00001 >> >> literal 7624 >> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP >> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY >> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT >> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& >> >> diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am >> index af729b0..811b21a 100644 >> --- a/example/packet/Makefile.am >> +++ b/example/packet/Makefile.am >> @@ -9,9 +9,11 @@ noinst_HEADERS = \ >> >> dist_odp_pktio_SOURCES = odp_pktio.c >> >> +dist_bin_SCRIPTS = pktio_run.sh >> + >> if test_example >> if HAVE_PCAP >> TESTS = pktio_run.sh >> endif >> endif >> -EXTRA_DIST = pktio_run.sh udp64.pcap >> +EXTRA_DIST = pktio_run.sh >> diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh >> index 3adb2d6..c5860d1 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` >> +PCAP_IN=`find ../../pcap -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 >> deleted file mode 100644 >> index >> 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000 >> GIT binary patch >> literal 0 >> HcmV?d00001 >> >> literal 7624 >> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP >> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY >> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT >> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& >> >> diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am >> index 4134bcf..047e8ca 100644 >> --- a/example/switch/Makefile.am >> +++ b/example/switch/Makefile.am >> @@ -9,9 +9,11 @@ noinst_HEADERS = \ >> >> dist_odp_switch_SOURCES = odp_switch.c >> >> +dist_bin_SCRIPTS = switch_run.sh >> + >> if test_example >> if HAVE_PCAP >> TESTS = switch_run.sh >> endif >> endif >> -EXTRA_DIST = switch_run.sh udp64.pcap >> +EXTRA_DIST = switch_run.sh >> diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh >> index 9b32973..238564f 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` >> +PCAP_IN=`find . ../../pcap -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 >> deleted file mode 100644 >> index >> 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000 >> GIT binary patch >> literal 0 >> HcmV?d00001 >> >> literal 7624 >> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP >> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY >> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT >> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& >> >> diff --git a/pcap/Makefile.am b/pcap/Makefile.am >> new file mode 100644 >> index 0000000..c4770b6 >> --- /dev/null >> +++ b/pcap/Makefile.am >> @@ -0,0 +1,3 @@ >> +EXTRA_DIST = udp64.pcap >> + >> +dist_bin_SCRIPTS = udp64.pcap >> diff --git a/pcap/udp64.pcap b/pcap/udp64.pcap >> new file mode 100644 >> index >> 0000000000000000000000000000000000000000..45f9d6e6341a331125e1e3e49ab8ad1e71b20712 >> GIT binary patch >> literal 7624 >> zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP >> zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY >> zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT >> XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& >> >> literal 0 >> HcmV?d00001 >> >> -- >> 2.7.4 >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp >> > >
diff --git a/Makefile.am b/Makefile.am index 2129472..c1bd594 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,8 @@ SUBDIRS = @platform_with_platform@ \ helper/test \ doc \ example \ - scripts + scripts \ + pcap @DX_RULES@ diff --git a/configure.ac b/configure.ac index 7cd6670..1ef9739 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,7 @@ 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 fe20654..ca87d49 100644 --- a/example/l2fwd_simple/Makefile.am +++ b/example/l2fwd_simple/Makefile.am @@ -9,9 +9,11 @@ noinst_HEADERS = \ dist_odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c +dist_bin_SCRIPTS = l2fwd_simple_run.sh + if test_example if HAVE_PCAP TESTS = l2fwd_simple_run.sh endif endif -EXTRA_DIST = l2fwd_simple_run.sh udp64.pcap +EXTRA_DIST = l2fwd_simple_run.sh diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index 6050360..d88fdf6 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` +PCAP_IN=`find . ../../pcap -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/example/l2fwd_simple/udp64.pcap b/example/l2fwd_simple/udp64.pcap deleted file mode 100644 index 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7624 zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am index af729b0..811b21a 100644 --- a/example/packet/Makefile.am +++ b/example/packet/Makefile.am @@ -9,9 +9,11 @@ noinst_HEADERS = \ dist_odp_pktio_SOURCES = odp_pktio.c +dist_bin_SCRIPTS = pktio_run.sh + if test_example if HAVE_PCAP TESTS = pktio_run.sh endif endif -EXTRA_DIST = pktio_run.sh udp64.pcap +EXTRA_DIST = pktio_run.sh diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh index 3adb2d6..c5860d1 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` +PCAP_IN=`find ../../pcap -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 deleted file mode 100644 index 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7624 zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am index 4134bcf..047e8ca 100644 --- a/example/switch/Makefile.am +++ b/example/switch/Makefile.am @@ -9,9 +9,11 @@ noinst_HEADERS = \ dist_odp_switch_SOURCES = odp_switch.c +dist_bin_SCRIPTS = switch_run.sh + if test_example if HAVE_PCAP TESTS = switch_run.sh endif endif -EXTRA_DIST = switch_run.sh udp64.pcap +EXTRA_DIST = switch_run.sh diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh index 9b32973..238564f 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 . ${TEST_DIR} $(dirname $0) -name udp64.pcap -print -quit` +PCAP_IN=`find . ../../pcap -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 deleted file mode 100644 index 45f9d6e6341a331125e1e3e49ab8ad1e71b20712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7624 zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& diff --git a/pcap/Makefile.am b/pcap/Makefile.am new file mode 100644 index 0000000..c4770b6 --- /dev/null +++ b/pcap/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = udp64.pcap + +dist_bin_SCRIPTS = udp64.pcap
Examples should not duplicate pcap files Install the scripts and pcap file so that it can be run where it is installed after moving it to a common location in the repo Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- Makefile.am | 3 ++- configure.ac | 1 + example/l2fwd_simple/Makefile.am | 4 +++- example/l2fwd_simple/l2fwd_simple_run.sh | 2 +- example/l2fwd_simple/udp64.pcap | Bin 7624 -> 0 bytes example/packet/Makefile.am | 4 +++- example/packet/pktio_run.sh | 2 +- example/packet/udp64.pcap | Bin 7624 -> 0 bytes example/switch/Makefile.am | 4 +++- example/switch/switch_run.sh | 2 +- example/switch/udp64.pcap | Bin 7624 -> 0 bytes pcap/Makefile.am | 3 +++ pcap/udp64.pcap | Bin 0 -> 7624 bytes 13 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 example/l2fwd_simple/udp64.pcap delete mode 100644 example/packet/udp64.pcap delete mode 100644 example/switch/udp64.pcap create mode 100644 pcap/Makefile.am create mode 100644 pcap/udp64.pcap diff --git a/pcap/udp64.pcap b/pcap/udp64.pcap new file mode 100644 index 0000000000000000000000000000000000000000..45f9d6e6341a331125e1e3e49ab8ad1e71b20712 GIT binary patch literal 7624 zcmca|c+)~A1{MYw_+QV!zzF1AIDRVZQX4OW4Ui4OOdthJV3Lu8!IgnQ52VaNFl`SP zPy-M%&2gOL#31#rG%+bTB{eNQBQq;ICpRy@ps;AvtkLiqO%tPeXtbOdEel8Mj?wyY zv^_D}W*Ti5GK{vPNBat+eXG&_<7gilID#<RE*xzaj<yR&+l8a;!qKvDbPRcP%zboT XVRY^UIO8<hE*$M6kM@y?=pzFFfL+O& literal 0 HcmV?d00001