summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-07-06 15:23:34 -0700
committerEd Warnicke <eaw@cisco.com>2016-09-07 13:27:27 -0700
commit237944f38b6b08b83dff9dafbf0f7ee3ce9a3752 (patch)
tree03358b48c1fcb6a1ab1b25da5f55e42fd0a14a8e /scripts
parentc8291ef9611e465efd5ada0ff77b1018640b9690 (diff)
jvpp support for nsh
Augment APIs with entry_index for reply, dump and details Squashes: https://gerrit.fd.io/r/#/c/2538/ https://gerrit.fd.io/r/#/c/2118/ https://gerrit.fd.io/r/#/c/1884/ Change-Id: Ibbdc53e2db8ffa5499380f6ce70356c4a401315e Signed-off-by: Marek Gradzki <mgradzki@cisco.com> Signed-off-by: Hongjun Ni <hongjun.ni@intel.com> Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci/verify.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/ci/verify.sh b/scripts/ci/verify.sh
index 78cdd6e..e00e005 100755
--- a/scripts/ci/verify.sh
+++ b/scripts/ci/verify.sh
@@ -19,6 +19,13 @@ NSH_PLUGIN_DIR=$(dirname $0)/../../nsh-plugin/
NSH_PLUGIN_DIR=$(readlink -f $NSH_PLUGIN_DIR)
echo "NSH_PLUGIN_DIR: ${NSH_PLUGIN_DIR}"
export NSH_INSTALL_PREFIX=${NSH_PLUGIN_DIR}/_install
+export SUDOCMD=""
+if test -f /usr/bin/lsb_release && test `lsb_release -si` == "Ubuntu" && test `lsb_release -sr` == "14.04" && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then
+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+ export JAVAC=${JAVA_HOME}/bin/javac
+ export PATH=${JAVA_HOME}/bin/:${PATH}
+ break
+fi
${NSH_PLUGIN_DIR}/build.sh