From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 235 (lumag:plat-def-2)
** https://github.com/Linaro/odp/pull/235
** Patch: https://github.com/Linaro/odp/pull/235.patch
** Base sha: ec0c3145fcafa09ae3a79875e7e07dd4794583cc
** Merge commit sha: 9783e8a21510c37c97bc377ad9b5b2f83aa4b842
**/
example/Makefile.inc | 2 ++
example/l2fwd_simple/l2fwd_simple_run.sh | 2 +-
example/l3fwd/odp_l3fwd_run.sh | 2 +-
example/packet/pktio_run.sh | 8 ++++----
example/switch/switch_run.sh | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/example/Makefile.inc b/example/Makefile.inc
index 12edc46c0..1609066e6 100644
--- a/example/Makefile.inc
+++ b/example/Makefile.inc
@@ -1,3 +1,5 @@
+TESTS_ENVIRONMENT = EXEEXT=${EXEEXT}
+
LIB = $(top_builddir)/lib
LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS)
AM_CFLAGS = \
diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh
b/example/l2fwd_simple/l2fwd_simple_run.sh
index 130a3a848..bc0d5ab28 100755
--- a/example/l2fwd_simple/l2fwd_simple_run.sh
+++ b/example/l2fwd_simple/l2fwd_simple_run.sh
@@ -9,7 +9,7 @@
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 &
+./odp_l2fwd_simple${EXEEXT} pcap:in=${PCAP_IN} pcap:out=pcapout.pcap
02:00:00:00:00:01 02:00:00:00:00:02 &
sleep 1
kill -s SIGINT $!
diff --git a/example/l3fwd/odp_l3fwd_run.sh b/example/l3fwd/odp_l3fwd_run.sh
index 6f0b11a04..dff3afd71 100755
--- a/example/l3fwd/odp_l3fwd_run.sh
+++ b/example/l3fwd/odp_l3fwd_run.sh
@@ -11,7 +11,7 @@ PCAP_OUT="pcapout.pcap"
PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}`
echo "using PCAP_IN = ${PCAP_IN}, PCAP_OUT = ${PCAP_OUT}"
-./odp_l3fwd -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \
+./odp_l3fwd${EXEEXT} -i pcap:in=${PCAP_IN},pcap:out=${PCAP_OUT} \
-r "10.0.0.0/24,pcap:out=${PCAP_OUT}" -d 30
STATUS=$?
diff --git a/example/packet/pktio_run.sh b/example/packet/pktio_run.sh
index 3adb2d62e..122418b6e 100755
--- a/example/packet/pktio_run.sh
+++ b/example/packet/pktio_run.sh
@@ -12,7 +12,7 @@ PCAP_IN_SIZE=`stat -c %s ${PCAP_IN}`
echo "using PCAP in=${PCAP_IN}:out=${PCAP_OUT} size %${PCAP_IN_SIZE}"
# burst mode
-./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0
+./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0
STATUS=$?
PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}`
rm -f ${PCAP_OUT}
@@ -24,7 +24,7 @@ fi
echo "Pass -m 0: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}"
# queue mode
-./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 1
+./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 1
STATUS=$?
PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}`
rm -f ${PCAP_OUT}
@@ -36,7 +36,7 @@ fi
echo "Pass -m 1: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}"
# sched/queue mode
-./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 2
+./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 2
STATUS=$?
PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}`
rm -f ${PCAP_OUT}
@@ -48,7 +48,7 @@ fi
echo "Pass -m 2: status ${STATUS}, in:${PCAP_IN_SIZE} out:${PCAP_OUT_SIZE}"
# cpu number option test 1
-./odp_pktio -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 -c 1
+./odp_pktio${EXEEXT} -ipcap:in=${PCAP_IN}:out=${PCAP_OUT} -t 5 -m 0 -c 1
STATUS=$?
PCAP_OUT_SIZE=`stat -c %s ${PCAP_OUT}`
rm -f ${PCAP_OUT}
diff --git a/example/switch/switch_run.sh b/example/switch/switch_run.sh
index d9aa8bd06..9a8e8480a 100755
--- a/example/switch/switch_run.sh
+++ b/example/switch/switch_run.sh
@@ -19,7 +19,7 @@ do
RX_PORTS="${RX_PORTS},pcap:out=pcapout${i}.pcap"
done
-./odp_switch -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1
+./odp_switch${EXEEXT} -i pcap:in=${PCAP_IN}${RX_PORTS} -t 1
STATUS=$?
if [ "$STATUS" -ne 0 ]; then
echo "Error: status was: $STATUS, expected 0"
