[build] Use gdb 2017-04-08-aebcde5

This commit is contained in:
Bruno de Oliveira Abinader
2017-05-17 11:05:23 +03:00
parent cc1ea759a6
commit c2f7f48a22
3 changed files with 8 additions and 7 deletions

View File

@@ -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:

View File

@@ -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

View File

@@ -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