Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add multi-vm Vagrantfile for vcl-test.
[vpp.git]
/
extras
/
vagrant
/
vcl_test.sh
diff --git
a/extras/vagrant/vcl_test.sh
b/extras/vagrant/vcl_test.sh
index
9fb924a
..
3be1851
100644
(file)
--- a/
extras/vagrant/vcl_test.sh
+++ b/
extras/vagrant/vcl_test.sh
@@
-1,23
+1,25
@@
#!/bin/bash
#!/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
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="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 make dpdk-install-dev build-release
+sudo sysctl -p$VPP_DIR/src/vpp/conf/80-vpp.conf
sudo modprobe uio_pci_generic
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
+