From 9d6866a1f251f31791491759087b3cbf2143b4d7 Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 21 Dec 2016 16:18:00 +0100 Subject: [PATCH] minor updates to test/basictest.sh Change-Id: I6c7c57902d592a8b668c20cde3f09abe6904f752 Signed-off-by: tierno --- test/basictest.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/basictest.sh b/test/basictest.sh index 7effee99..3b2b3535 100755 --- a/test/basictest.sh +++ b/test/basictest.sh @@ -92,14 +92,17 @@ export OPENMANO_PORT=9090 if [[ -n "$option_install_openvim" ]] then - pushd ${DIRmano}/.. - echo "installing openvim at $PWD/openvim ... " + mkdir -p ${DIRNAME}/local + pushd ${DIRNAME}/local + echo "installing openvim at ${DIRNAME}/openvim ... " wget -O install-openvim.sh "https://osm.etsi.org/gitweb/?p=osm/openvim.git;a=blob_plain;f=scripts/install-openvim.sh" chmod +x install-openvim.sh sudo ./install-openvim.sh --no-install-packages --force --quiet --develop - alias initopenvim="${PWD}/openvim/scripts/initopenvim.sh" - alias openvim="${PWD}/openvim/scripts/openvim" - option_init_openvim="-" + export alias initopenvim="${PWD}/openvim/scripts/initopenvim.sh" + export alias openvim="${PWD}/openvim/scripts/openvim" + option_init_openvim="" + ${DIRNAME}/local/openvim/scripts/initopenvim.sh${force_param}${insert_bashrc_param}${screen_vim_param} || echo "WARNING openvim cannot be initialized. The rest of test can fail!" + popd fi [[ -z "$option_init_openvim" ]] || initopenvim${force_param}${insert_bashrc_param}${screen_vim_param} || echo "WARNING openvim cannot be initialized. The rest of test can fail!" -- 2.17.1