diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | scripts/travis_setup.sh | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 033e05e524..0fd3bbcc77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,7 +98,7 @@ 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_install_gdb_logbt - mapbox_start_xvfb - mapbox_export_mesa_library_path script: @@ -125,7 +125,7 @@ matrix: before_script: - 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_install_gdb_logbt - mapbox_start_xvfb - mapbox_export_mesa_library_path script: @@ -154,7 +154,7 @@ 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_install_gdb_logbt - mapbox_start_xvfb - mapbox_export_mesa_library_path script: @@ -315,7 +315,8 @@ benchmark: $(LINUX_BUILD) $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark ifneq (,$(shell command -v gdb 2> /dev/null)) - GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args + GDB = $(shell scripts/mason.sh PREFIX gdb VERSION 2017-04-08-aebcde5)/bin/gdb \ + -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args endif .PHONY: run-test diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index 20a708d20a..ed887008d5 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -33,9 +33,9 @@ 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} +function mapbox_install_gdb_logbt { + scripts/mason.sh INSTALL gdb VERSION 2017-04-08-aebcde5 + export PATH=$(scripts/mason.sh PREFIX gdb VERSION 2017-04-08-aebcde5)/bin:${PATH} curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.1.tar.gz | tar --gunzip --extract --strip-components=2 --exclude="*md" --exclude="test*" --directory=. sudo ./logbt --setup ./logbt --test |