diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-06-17 21:13:04 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-06-17 21:16:46 -0500 |
| commit | ea158d46051c9f2d10dfd15895dc96cd2240de5a (patch) | |
| tree | 55f93e4e42e5372c6097d3a2d504dea6855d1441 | |
| parent | 4928fda10e118ac7eecc296d04b8c93f9078f369 (diff) | |
Have verify.sh use build.sh so verify checks user code path
Change-Id: Iadc3b1cec27d994daf6bc096c2230be19b565655
Signed-off-by: Ed Warnicke <eaw@cisco.com>
| -rwxr-xr-x | nsh-plugin/build.sh | 6 | ||||
| -rwxr-xr-x | scripts/ci/verify.sh | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/nsh-plugin/build.sh b/nsh-plugin/build.sh index 613a136..4a8c3d1 100755 --- a/nsh-plugin/build.sh +++ b/nsh-plugin/build.sh @@ -1,7 +1,11 @@ #!/usr/bin/env bash +NSH_PLUGIN_DIR=$(dirname $0) +NSH_INSTALL_PREFIX=${NSH_INSTALL_PREFIX:-/usr} +cd ${NSH_PLUGIN_DIR} autoreconf -i -f [ -d build ] || mkdir build +[ -d ${NSH_INSTALL_PREFIX} ] || mkdir -p ${NSH_INSTALL_PREFIX} cd build -../configure --prefix /usr +../configure --prefix ${NSH_INSTALL_PREFIX} make sudo make install diff --git a/scripts/ci/verify.sh b/scripts/ci/verify.sh index aa73d97..78cdd6e 100755 --- a/scripts/ci/verify.sh +++ b/scripts/ci/verify.sh @@ -15,15 +15,10 @@ echo DISTRIB_RELEASE: $DISTRIB_RELEASE echo DISTRIB_CODENAME: $DISTRIB_CODENAME echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION -NSH_PLUGIN_DIR=$(dirname $0)/../../nsh-plugin +NSH_PLUGIN_DIR=$(dirname $0)/../../nsh-plugin/ +NSH_PLUGIN_DIR=$(readlink -f $NSH_PLUGIN_DIR) echo "NSH_PLUGIN_DIR: ${NSH_PLUGIN_DIR}" -cd ${NSH_PLUGIN_DIR} -autoreconf -i -f -mkdir _install -mkdir _build -cd _build -../configure --prefix=$(pwd)/../../_install -make -make install +export NSH_INSTALL_PREFIX=${NSH_PLUGIN_DIR}/_install +${NSH_PLUGIN_DIR}/build.sh |