Skip to content

Commit

Permalink
Fix Nyx codecov builds.
Browse files Browse the repository at this point in the history
These don't generate gcno files.
  • Loading branch information
jschwartzentruber committed Feb 13, 2024
1 parent b6d84fd commit 04f1cb9
Show file tree
Hide file tree
Showing 5 changed files with 270 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/fuzzfetch/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def resolve_targets(self, targets: Sequence[str]) -> None:
resolve_url(url)

if have_exec:
if self._flags.coverage:
if self._flags.coverage and not self._flags.nyx:
resolve_url(self.artifact_url("code-coverage-gcno.zip"))

if (
Expand Down Expand Up @@ -578,7 +578,7 @@ def extract_build(self, path: PathArg) -> None:
self.extract_zip(url, path)

if have_exec:
if self._flags.coverage:
if self._flags.coverage and not self._flags.nyx:
self.extract_zip(self.artifact_url("code-coverage-gcno.zip"), path)

if (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"namespace": "gecko.v2.mozilla-central.latest.firefox.linux64-ccov-fuzzing-asan-nyx-opt",
"taskId": "ZcTIYEkjQO2aChxeIY6fbw",
"rank": 1707687417,
"data": {},
"expires": "2025-02-10T21:43:10.430Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
{
"artifacts": [
{
"storageType": "s3",
"name": "public/build/buildhub.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/json"
},
{
"storageType": "s3",
"name": "public/build/config.status",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/octet-stream"
},
{
"storageType": "s3",
"name": "public/build/host/bin/mar",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/octet-stream"
},
{
"storageType": "s3",
"name": "public/build/host/bin/mbsdiff",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/octet-stream"
},
{
"storageType": "s3",
"name": "public/build/mozharness.zip",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/zip"
},
{
"storageType": "s3",
"name": "public/build/profile_build_resources.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/json"
},
{
"storageType": "s3",
"name": "public/build/target.awsy.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.checksums",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/octet-stream"
},
{
"storageType": "s3",
"name": "public/build/target.common.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.condprof.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.cppunittest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.fuzztest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.generated-files.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.gtest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target_info.txt",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "text/plain"
},
{
"storageType": "s3",
"name": "public/build/target.jittest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/json"
},
{
"storageType": "s3",
"name": "public/build/target.jsreftest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.jsshell.zip",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/zip"
},
{
"storageType": "s3",
"name": "public/build/target.langpack.xpi",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/x-xpinstall"
},
{
"storageType": "s3",
"name": "public/build/target.mochitest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.mozinfo.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/json"
},
{
"storageType": "s3",
"name": "public/build/target.perftests.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.raptor.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.reftest.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.talos.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.tar.bz2",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/x-bzip2"
},
{
"storageType": "s3",
"name": "public/build/target.test_packages.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/json"
},
{
"storageType": "s3",
"name": "public/build/target.txt",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "text/plain"
},
{
"storageType": "s3",
"name": "public/build/target.updater-dep.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.web-platform.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.xpcshell.tests.tar.gz",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/gzip"
},
{
"storageType": "s3",
"name": "public/build/target.xpt_artifacts.zip",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/zip"
},
{
"storageType": "s3",
"name": "public/chain-of-trust.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "text/plain"
},
{
"storageType": "s3",
"name": "public/chain-of-trust.json.sig",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/octet-stream"
},
{
"storageType": "s3",
"name": "public/logs/certified.log",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "text/plain"
},
{
"storageType": "s3",
"name": "public/logs/live_backing.log",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "text/plain; charset=utf-8"
},
{
"storageType": "reference",
"name": "public/logs/live.log",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "text/plain; charset=utf-8"
},
{
"storageType": "s3",
"name": "public/logs/localconfig.json",
"expires": "2025-02-10T21:43:10.430Z",
"contentType": "application/json"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"as": "/builds/worker/fetches/sccache/sccache /builds/worker/fetches/afl-instrumentation/bin/afl-clang-fast --sysroot /builds/worker/fetches/sysroot-x86_64-linux-gnu -std=gnu99",
"buildid": "20240211213657",
"cc": "/builds/worker/fetches/sccache/sccache /builds/worker/fetches/afl-instrumentation/bin/afl-clang-fast --sysroot /builds/worker/fetches/sysroot-x86_64-linux-gnu -std=gnu99",
"cxx": "/builds/worker/fetches/sccache/sccache /builds/worker/fetches/afl-instrumentation/bin/afl-clang-fast++ --sysroot /builds/worker/fetches/sysroot-x86_64-linux-gnu",
"host_alias": "x86_64-pc-linux-gnu",
"moz_app_id": "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
"moz_app_maxversion": "124.0a1",
"moz_app_name": "firefox",
"moz_app_vendor": "Mozilla",
"moz_app_version": "124.0a1",
"moz_pkg_platform": "linux-x86_64-asan",
"moz_source_repo": "https://hg.mozilla.org/mozilla-central",
"moz_source_stamp": "13676fc9b0cd8461cb9863d3a2d1b9a696a9c0f5",
"moz_update_channel": "default",
"target_alias": "x86_64-pc-linux-gnu"
}
6 changes: 6 additions & 0 deletions tests/test_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@ def test_nyx_builds():
build_flags_factory(asan=True, fuzzing=True, nyx=True),
DEFAULT_TARGETS,
)
Fetcher(
"central",
"latest",
build_flags_factory(asan=True, fuzzing=True, nyx=True, coverage=True),
DEFAULT_TARGETS,
)


@pytest.mark.usefixtures("fetcher_mock_resolve_targets", "requests_mock_cache")
Expand Down

0 comments on commit 04f1cb9

Please sign in to comment.