[node] fix bad conditional, actually run tests

This commit is contained in:
Mike Morris
2016-09-20 14:45:59 -04:00
committed by John Firebaugh
parent ea80168b42
commit 8bc8713e70
2 changed files with 7 additions and 8 deletions

View File

@@ -49,7 +49,7 @@ script:
- make run-test
after_script:
- ccache --show-stats
- ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-}
- ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER}
matrix:
include:
@@ -63,16 +63,16 @@ matrix:
addons: *clang35
before_script:
- export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
- export PUBLISH=$([[ ${TAG} == "node-v${PACKAGE_JSON_VERSION}" ]] && echo 1 || echo 0)
- export BUILDTYPE=$([[ ${PUBLISH} ]] && echo "Release" || echo "Debug")
- export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
- export BUILDTYPE=$([[ -n ${PUBLISH:-} ]] && echo "Release" || echo "Debug")
script:
- nvm install 4
- nvm use 4
- make node
- if [[ ! ${PUBLISH} ]]; then make test-node; fi
- if [[ -z ${PUBLISH} ]]; then make test-node; fi
after_script:
- ccache --show-stats
- ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-}
- ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER}
# GCC 5 - Debug - Coverage
- os: linux

View File

@@ -4,10 +4,9 @@ set -e
set -o pipefail
JOB=$1
TAG=$2
if [[ ${PUBLISH} ]]; then
if [[ "$BUILDTYPE" == "Debug" ]]; then
if [[ -n ${PUBLISH:-} ]]; then
if [[ "${BUILDTYPE}" == "Debug" ]]; then
echo "Please run this script in release mode (BUILDTYPE=Release)."
exit 1
else