X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvagrant%2Fvcl_test.sh;h=2203db66d8f6a2a15fe41f968fc84d7d366c8aeb;hb=070453d872b22b75182381c44817c9486d280ec4;hp=9fb924aeddbb230b687516750abf97ced436cf43;hpb=3079a64e19e997e6735b633377285bb5718f4067;p=vpp.git

diff --git a/extras/vagrant/vcl_test.sh b/extras/vagrant/vcl_test.sh
old mode 100644
new mode 100755
index 9fb924aeddb..2203db66d8f
--- a/extras/vagrant/vcl_test.sh
+++ b/extras/vagrant/vcl_test.sh
@@ -1,23 +1,25 @@
 #!/bin/bash
 
-# Get Command Line arguements if present
-VPP_DIR=$1
-if [ "x$1" != "x" ]; then
+if [ -n "$1" ]; then
     VPP_DIR=$1
 else
     VPP_DIR=`dirname $0`/../../
 fi
 
-if [ "x$2" != "x" ]; then
+if [ -n "$2" ]; then
     SUDOCMD="sudo -H -u $2"
 fi
 
 echo 'Building VCL test apps'
 cd $VPP_DIR
-$SUDOCMD perl -pi -e 's/noinst_PROGRAMS/bin_PROGRAMS/g' $VPP_DIR/src/uri.am
-$SUDOCMD make build-release
-echo "export WS_ROOT=$VPP_DIR" | sudo -H -u vagrant tee /home/vagrant/.bash_aliases
-source /home/vagrant/.bash_aliases
-sudo cp $VPP_DIR/src/vpp/conf/80-vpp.conf /etc/sysctl.d
-sudo sysctl -p/etc/sysctl.d/80-vpp.conf
+$SUDOCMD perl -pi -e 's/noinst_PROGRAMS/bin_PROGRAMS/g' $VPP_DIR/src/vcl.am
+$SUDOCMD make dpdk-install-dev build-release
+sudo sysctl -p$VPP_DIR/src/vpp/conf/80-vpp.conf
 sudo modprobe uio_pci_generic
+
+if [ "$2" = "vagrant" ] && [ -d "/home/vagrant" ] ; then
+    dot_bash_aliases="/home/$2/.bash_aliases"
+    echo "export WS_ROOT=$VPP_DIR" | $SUDOCMD tee $dot_bash_aliases
+    source $dot_bash_aliases
+fi
+