diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 5 insertions, 7 deletions
@@ -60,7 +60,7 @@ xproj: $(OSX_PROJ_PATH) $(OSX_WORK_PATH) cp platform/osx/WorkspaceSettings.xcsettings "$(OSX_USER_DATA_PATH)/WorkspaceSettings.xcsettings" open $(OSX_WORK_PATH) -test-osx: osx node_modules/express +test-osx: osx node_modules ulimit -c unlimited && ($(OSX_OUTPUT_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \ || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1)) set -o pipefail && xcodebuild \ @@ -227,7 +227,7 @@ qt-app: $(QT_MAKEFILE) qt-qml-app: $(QT_MAKEFILE) $(QT_ENV) $(MAKE) -j$(JOBS) -C $(QT_OUTPUT_PATH) qt-qml-app -test-qt: $(QT_MAKEFILE) node_modules/express +test-qt: $(QT_MAKEFILE) node_modules $(QT_ENV) $(MAKE) -j$(JOBS) -C $(QT_OUTPUT_PATH) test $(GDB) $(QT_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=* @@ -251,7 +251,7 @@ $(LINUX_MAKEFILE): platform/linux/platform.gyp $(LINUX_OUTPUT_PATH)/config.gypi linux: glfw-app render offline -test-linux: test-* +test-linux: node_modules test-* render: $(LINUX_MAKEFILE) $(MAKE) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-render @@ -275,12 +275,9 @@ ifneq (,$(shell which gdb)) GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args endif -test-%: node_modules/express test +test-%: test $(GDB) $(LINUX_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=$* -node_modules/express: - npm install express@4.11.1 - check: test scripts/collect-coverage.sh $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) diff --git a/package.json b/package.json index a9fe67f8c3..515a58c790 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ }, "devDependencies": { "aws-sdk": "^2.3.5", + "express": "^4.11.1", "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#b3441d9a285ffbe9b876677acb13d7df07e5b975", "node-gyp": "^3.3.1", "request": "^2.72.0", |