diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-08 13:06:16 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-09 10:56:01 -0600 |
| commit | 9df24addfbfd922baada7d9778f402b91e69ed33 (patch) | |
| tree | 09fd7e0a7ef200e4ce9046d0aca9918c0caa46c2 | |
| parent | 13e504155330fe0c0e6963a10c7f4e99d3d1696a (diff) | |
| download | qtlocation-mapboxgl-9df24addfbfd922baada7d9778f402b91e69ed33.tar.gz | |
[node] Run test with logbt
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | scripts/travis_setup.sh | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 30c3fa6be6..13ee36cc23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,13 +90,14 @@ matrix: env: BUILDTYPE=Debug _CXX=clang++-3.8 _CC=clang-3.8 WITH_EGL=1 addons: *clang38 before_script: + - mapbox_install_logbt - mapbox_start_xvfb - mapbox_export_mesa_library_path script: - nvm install 4 - nvm use 4 - make node - - $(scripts/mason.sh PREFIX apitrace VERSION 6a30de1)/bin/apitrace trace --api=egl -v make test-node + - ./logbt -- $(scripts/mason.sh PREFIX apitrace VERSION 6a30de1)/bin/apitrace trace --api=egl -v make test-node after_script: - ccache --show-stats - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} @@ -116,13 +117,14 @@ matrix: - sudo apt-get purge -qq fglrx - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true) + - mapbox_install_logbt - mapbox_start_xvfb - mapbox_export_mesa_library_path script: - nvm install 4 - nvm use 4 - make node - - $(scripts/mason.sh PREFIX apitrace VERSION 6a30de1)/bin/apitrace trace --api=egl -v make test-node + - ./logbt -- $(scripts/mason.sh PREFIX apitrace VERSION 6a30de1)/bin/apitrace trace --api=egl -v make test-node after_script: - ccache --show-stats - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index 20688ab4ec..28af6f30aa 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -33,6 +33,14 @@ fi mapbox_time "touch_package_json" \ touch package.json +function mapbox_install_logbt { + scripts/mason.sh INSTALL gdb VERSION 7.12 + export PATH=$(scripts/mason.sh PREFIX gdb VERSION 7.12)/bin:${PATH} + curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.0.tar.gz | tar --gunzip --extract --strip-components=2 --exclude="*md" --exclude="test*" --directory=. + sudo ./logbt --setup + ./logbt --test +} + function mapbox_start_xvfb { if [ ! -f /etc/init.d/xvfb ]; then echo "Error: Could not start Xvfb mock server." |