Google Git
Sign in
chromium / chromium / src.git / 966c8a91b4c0af134cd4e5e48cbed2fb2fec9388
commit966c8a91b4c0af134cd4e5e48cbed2fb2fec9388[log] [tgz]
authorYuke Liao <liaoyuke@chromium.org>Wed May 08 19:30:52 2019
committerCommit Bot <commit-bot@chromium.org>Wed May 08 19:30:52 2019
tree5928c9fd33344c7756b8ff6f3aca55e8511965c7
parent1245a63815199fcb3695c9d563894030794fbb6c [diff]
[code coverage] Switch order of coverage and test results merge scripts

This CL switches the invocation order of coverage merger and test
results merger so that test results merger is invoked after coverage
merger, otherwise, some test results merger such as layout tests will
treat the coverage dumps as test results json files and try to merge
them, which will result in errors.

Bug: 923711
Change-Id: Idd890781081643e4bb790e424e6382d32e78f72e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1601412
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: Roberto Carrillo <robertocn@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#657815}
1 file changed
tree: 5928c9fd33344c7756b8ff6f3aca55e8511965c7
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. build_overrides/
  7. buildtools/
  8. cc/
  9. chrome/
  10. chrome_elf/
  11. chromecast/
  12. chromeos/
  13. cloud_print/
  14. components/
  15. content/
  16. courgette/
  17. crypto/
  18. dbus/
  19. device/
  20. docs/
  21. extensions/
  22. fuchsia/
  23. gin/
  24. google_apis/
  25. google_update/
  26. gpu/
  27. headless/
  28. infra/
  29. ios/
  30. ipc/
  31. jingle/
  32. media/
  33. mojo/
  34. native_client_sdk/
  35. net/
  36. pdf/
  37. ppapi/
  38. printing/
  39. remoting/
  40. rlz/
  41. sandbox/
  42. services/
  43. skia/
  44. sql/
  45. storage/
  46. styleguide/
  47. testing/
  48. third_party/
  49. tools/
  50. ui/
  51. url/
  52. .clang-format
  53. .eslintrc.js
  54. .git-blame-ignore-revs
  55. .gitattributes
  56. .gitignore
  57. .gn
  58. .vpython
  59. AUTHORS
  60. BUILD.gn
  61. CODE_OF_CONDUCT.md
  62. codereview.settings
  63. DEPS
  64. ENG_REVIEW_OWNERS
  65. LICENSE
  66. LICENSE.chromium_os
  67. OWNERS
  68. PRESUBMIT.py
  69. PRESUBMIT_test.py
  70. PRESUBMIT_test_mocks.py
  71. README.md
  72. WATCHLISTS
README.md

Logo Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure .