diff options
| author | Ryan Keane <rwkeane@google.com> | 2020-05-06 17:29:39 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-07 01:20:35 +0000 |
| commit | 4aa11daaa6795b52c57b26376502a0c273700f2e (patch) | |
| tree | f638d44d75a8f291bdae611cfa2d924f6d288498 /build/code_coverage | |
| parent | 56d1a2ebc3fa8fb3ef969e31a1b71e547ac1d32a (diff) | |
| download | openscreen-4aa11daaa6795b52c57b26376502a0c273700f2e.tar.gz | |
Code Coverage: Fix Merge Issues
Change-Id: I97d46458da005bdf88f7f34a3a8f9dc9767fc40a
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2173544
Commit-Queue: Ryan Keane <rwkeane@google.com>
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'build/code_coverage')
| -rw-r--r-- | build/code_coverage/merge_lib.py | 8 | ||||
| -rw-r--r-- | build/code_coverage/merge_results.py | 1 | ||||
| -rw-r--r-- | build/code_coverage/merge_steps.py | 9 |
3 files changed, 3 insertions, 15 deletions
diff --git a/build/code_coverage/merge_lib.py b/build/code_coverage/merge_lib.py index 7ed59007..818044c3 100644 --- a/build/code_coverage/merge_lib.py +++ b/build/code_coverage/merge_lib.py @@ -1,9 +1,4 @@ -<<<<<<< HEAD -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -"""Functions for interacting with llvm-profdata""" -======= +#!/usr/bin/env/python # Copyright 2020 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,7 +8,6 @@ This script is taken from the chromium build tools and is synced manually on an as-needed basis: https://source.chromium.org/chromium/chromium/src/+/master:testing/merge_scripts/code_coverage/merge_lib.py """ ->>>>>>> master import logging import multiprocessing diff --git a/build/code_coverage/merge_results.py b/build/code_coverage/merge_results.py index b4faf60c..a049a906 100644 --- a/build/code_coverage/merge_results.py +++ b/build/code_coverage/merge_results.py @@ -1,3 +1,4 @@ +#!/usr/bin/env/python # Copyright 2020 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/build/code_coverage/merge_steps.py b/build/code_coverage/merge_steps.py index e716d3bf..40d0e946 100644 --- a/build/code_coverage/merge_steps.py +++ b/build/code_coverage/merge_steps.py @@ -1,10 +1,4 @@ -<<<<<<< HEAD -#!/usr/bin/python -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -"""This script merges code coverage profiles from multiple steps.""" -======= +#!/usr/bin/env/python # Copyright 2020 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -14,7 +8,6 @@ This script is taken from the chromium build tools and is synced manually on an as-needed basis: https://source.chromium.org/chromium/chromium/src/+/master:testing/merge_scripts/code_coverage/merge_steps.py?q=merge_steps.py&ss=chromium """ ->>>>>>> master import argparse import os |