aboutsummaryrefslogtreecommitdiffstats
path: root/test/scripts
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2018-11-06 17:45:32 -0500
committerFlorin Coras <florin.coras@gmail.com>2018-11-07 00:00:42 +0000
commit6ccff02def39f314765f82a39f5dea9a667e47c8 (patch)
tree35352241b62b2fd4fb3260ea4d0495787ee7df42 /test/scripts
parent8d3397425b3fe0f58b621854eb95d225fcbb415f (diff)
VCL: Fix socket_test.sh to build test apps.
- Replace autoconf base test app build detection with appropriate cmake based incantation. - Use the dpdk_devbind.py that is in the VPP tree. Change-Id: I4cdc11d159e2413d6bdb9c5ffcf1ed2d787b1cc5 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/scripts')
-rwxr-xr-xtest/scripts/socket_test.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh
index f408ad44d82..5ebca4df88b 100755
--- a/test/scripts/socket_test.sh
+++ b/test/scripts/socket_test.sh
@@ -9,7 +9,7 @@ vpp_shm_dir="/dev/shm/"
vpp_run_dir="/run/vpp"
lib_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib/"
lib_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib/"
-dpdk_devbind="/usr/share/dpdk/usertools/dpdk-devbind.py"
+dpdk_devbind="$WS_ROOT/extras/vpp_config/scripts/dpdk-devbind.py"
docker_vpp_dir="/vpp/"
docker_app_dir="/vpp/"
docker_lib_dir="/vpp-lib/"
@@ -270,9 +270,12 @@ if [ -z "$WS_ROOT" ] ; then
exit 1
fi
-if [[ "$(grep bin_PROGRAMS $WS_ROOT/src/vcl.am)" = "" ]] ; then
- $WS_ROOT/extras/vagrant/vcl_test.sh $WS_ROOT $USER
- (cd $WS_ROOT; make build)
+if [ ! -d $vpp_dir ] ; then
+ if [ -z "$title_dbg" ] ; then
+ (cd $WS_ROOT; make build-release)
+ else
+ (cd $WS_ROOT; make build)
+ fi
fi
if [ ! -d $vpp_dir ] ; then