diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-11 13:55:18 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-11 13:55:18 -0700 |
| commit | f3c55eba9da59042a96e683f841060674519520b (patch) | |
| tree | e2224b3e7e2d7c84a61b2db0ccc171bf9c615980 /Makefile | |
| parent | 8fc4d61025397180374ccc99e6798659470afb69 (diff) | |
| download | qtlocation-mapboxgl-f3c55eba9da59042a96e683f841060674519520b.tar.gz | |
add logging facility and check logs in tests
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -25,11 +25,11 @@ build/test/Makefile: src common config.gypi test/test.gyp deps/run_gyp test/test.gyp --depth=. -Goutput_dir=.. --generator-output=./build/test -f make test: build/test/Makefile - $(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test + $(MAKE) -C build/test BUILDTYPE=Testing V=$(V) test test/%: build/test/Makefile - $(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) $* - (cd build/$(BUILDTYPE) && exec ./test_$*) + $(MAKE) -C build/test BUILDTYPE=Testing V=$(V) $* + (cd build/Testing && exec ./test_$*) # build Mac OS X project for Xcode xtest: config.gypi clear_xcode_cache node @@ -42,7 +42,7 @@ xtest: config.gypi clear_xcode_cache node # Builds the linux app with make. This is also used by Travis CI linux: config.gypi linux/llmr-app.gyp node deps/run_gyp linux/llmr-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make - $(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp + $(MAKE) -C build/linux BUILDTYPE=Testing V=$(V) linuxapp # Executes the Linux binary run-linux: linux |