diff options
| author |   Keith Burns <alagalah@gmail.com> | 2016-06-21 11:34:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-06-21 11:34:28 +0000 |
| commit | cbc677c2de41cb3ecf4d40521995335db5cb1a71 (patch) | |
| tree | 87b12ec868fa663a3df910514db2fe392a0aa636 | |
| parent | a72e5a1cb6637486794da3fbcdd728d5e37fb5ff (diff) | |
| parent | ea158d46051c9f2d10dfd15895dc96cd2240de5a (diff) | |
Merge "Have verify.sh use build.sh so verify checks user code path"
| -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 |