diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-03 15:16:49 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-07 18:01:02 -0700 |
| commit | f964e40e7e9220d08751d8607af61ac5a7c0794c (patch) | |
| tree | d34ca5407188fe3d71396faa8a8acceb52d9bd4b /scripts/collect-coverage.sh | |
| parent | f5d66f362272db034a311d2077dbdb2937c9bbdf (diff) | |
| download | qtlocation-mapboxgl-f964e40e7e9220d08751d8607af61ac5a7c0794c.tar.gz | |
[build] Refactor and simplify build system
* Main gyp files are now standardized as platform/<platform>/platform.gyp.
* Each platform gyp file defines appropriate loop_lib and headless_lib variables.
* Each platform gyp file includes mbgl.gypi, which defines base targets which may be useful to all platforms.
* CI targets are consistent across platforms: `make $(PLATFORM) && make test-$(PLATFORM)`.
* Renamed the "linux" test app to "glfw". It's now built in OS X CI.
* Android build flakiness is fixed.
* iOS CI builds the bench and iosapp targets.
* Mesa version is now in one place.
* CI scripts use bash "strict mode" and correct error handling.
* All build output goes to the build directory.
* Removed vestigial iOS/OS X/Android Travis scripts.
Diffstat (limited to 'scripts/collect-coverage.sh')
| -rwxr-xr-x | scripts/collect-coverage.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/collect-coverage.sh b/scripts/collect-coverage.sh index 0007eebd5b..2e8ad9550b 100755 --- a/scripts/collect-coverage.sh +++ b/scripts/collect-coverage.sh @@ -25,12 +25,12 @@ command -v genhtml >/dev/null 2>&1 || usage lcov \ --quiet \ --zerocounters \ - --directory "build/${HOST_SLUG}/${BUILDTYPE}" \ - --output-file "build/${HOST_SLUG}/${BUILDTYPE}/coverage.info" \ + --directory "build/${PLATFORM_SLUG}/${BUILDTYPE}" \ + --output-file "build/${PLATFORM_SLUG}/${BUILDTYPE}/coverage.info" \ >/dev/null 2>&1 # Run all unit tests -./scripts/run_tests.sh "build/${HOST_SLUG}/${BUILDTYPE}/test" +make test-* # Collect coverage data and save it into coverage.info echo "Collecting coverage data..." @@ -41,9 +41,9 @@ lcov \ --directory "src/mbgl" \ --directory "platform" \ --directory "include/mbgl" \ - --directory "build/${HOST_SLUG}/${BUILDTYPE}" \ - --base-directory "build/${HOST_SLUG}/${BUILDTYPE}" \ - --output-file "build/${HOST_SLUG}/${BUILDTYPE}/coverage.info" \ + --directory "build/${PLATFORM_SLUG}/${BUILDTYPE}" \ + --base-directory "build/${PLATFORM_SLUG}/${BUILDTYPE}" \ + --output-file "build/${PLATFORM_SLUG}/${BUILDTYPE}/coverage.info" \ >/dev/null 2>&1 # Generate HTML report based on coverage.info @@ -59,8 +59,8 @@ genhtml \ --sort \ --demangle-cpp \ --prefix $(pwd -P) \ - --output-directory "build/${HOST_SLUG}/${BUILDTYPE}/coverage" \ - "build/${HOST_SLUG}/${BUILDTYPE}/coverage.info" \ + --output-directory "build/${PLATFORM_SLUG}/${BUILDTYPE}/coverage" \ + "build/${PLATFORM_SLUG}/${BUILDTYPE}/coverage.info" \ >/dev/null 2>&1 -echo "Coverage report is now available in build/${HOST_SLUG}/${BUILDTYPE}/coverage/index.html" +echo "Coverage report is now available in build/${PLATFORM_SLUG}/${BUILDTYPE}/coverage/index.html" |