Skip to content

Commit e3b2751

Browse files
authored
bot: Update grcov to version 0.5.10 (#478)
Remove grcov arguments that are no longer mandatory
1 parent 9a5ff22 commit e3b2751

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

bot/ci/bootstrap.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash -ex
2-
GRCOV_VERSION="v0.5.9"
2+
GRCOV_VERSION="v0.5.10"
33
MERCURIAL_VERSION="5.3"
44
VERSION_CONTROL_TOOLS_REV="2f7b4df4a928"
55

66
apt-get update
7-
apt-get install --no-install-recommends -y gcc curl bzip2 python-dev
7+
# libgoogle-perftools4 is currently required for grcov (until https://github.com/mozilla/grcov/issues/403 is fixed).
8+
apt-get install --no-install-recommends -y gcc curl bzip2 python-dev libgoogle-perftools4
89

910
pip install --disable-pip-version-check --quiet --no-cache-dir mercurial==$MERCURIAL_VERSION
1011

bot/code_coverage_bot/grcov.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,7 @@ def report(artifacts, source_dir=None, out_format="covdir", options=[]):
1717

1818
# Coveralls+ is only needed for zero-coverage reports
1919
if out_format == "coveralls+":
20-
cmd.extend(
21-
[
22-
"--service-name",
23-
"TaskCluster",
24-
"--commit-sha",
25-
"unused",
26-
"--token",
27-
"unused",
28-
"--service-job-number",
29-
"1",
30-
]
31-
)
20+
cmd.extend(["--token", "unused"])
3221

3322
if source_dir is not None:
3423
cmd.extend(["-s", source_dir])

bot/tests/test_grcov.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ def test_report_grcov_artifact_coverallsplus(grcov_artifact):
2424
output = grcov.report([grcov_artifact], out_format="coveralls+")
2525
report = json.loads(output.decode("utf-8"))
2626
assert report["repo_token"] == "unused"
27-
assert report["service_name"] == "TaskCluster"
28-
assert report["service_job_number"] == "1"
2927
assert report["git"]["branch"] == "master"
30-
assert report["git"]["head"]["id"] == "unused"
3128
assert report["service_number"] == ""
3229
assert len(report["source_files"]) == 1
3330
assert report["source_files"][0]["name"] == "js/src/jit/BitSet.cpp"

0 commit comments

Comments
 (0)