Add coverage & radamsa collection to integration tests
@@ -68,13 +68,13 @@ TARGETS: Dict[str, Integration] = {
os=OS.linux,
target_exe="fuzz.exe",
inputs="seeds",
- wait_for_files=[ContainerType.unique_reports],
+ wait_for_files=[ContainerType.unique_reports, ContainerType.coverage],
),
"linux-libfuzzer-rust": Integration(
template=TemplateType.libfuzzer,
os=OS.linux,
target_exe="fuzz_target_1",
- wait_for_files=[ContainerType.unique_reports],
+ wait_for_files=[ContainerType.unique_reports, ContainerType.coverage],
),
"linux-trivial-crash": Integration(
template=TemplateType.radamsa,
@@ -96,16 +96,18 @@ TARGETS: Dict[str, Integration] = {
os=OS.windows,
target_exe="fuzz.exe",
inputs="seeds",
+ wait_for_files=[
+ ContainerType.unique_reports,
+ ContainerType.coverage,
+ ],
+ ),
+ "windows-trivial-crash": Integration(
+ template=TemplateType.radamsa,
+ os=OS.windows,
+ target_exe="fuzz.exe",
+ inputs="seeds",
wait_for_files=[ContainerType.unique_reports],
),
- # TODO: include windows build of radamsa
- # "windows-trivial-crash": Integration(
- # template=TemplateType.libfuzzer,
- # os=OS.windows,
- # target_exe="fuzz.exe",
- # inputs="seeds",
- # wait_for_files=[ContainerType.unique_reports],
- # ),
}
@@ -333,10 +335,15 @@ class TestOnefuzz:
if job_id in self.containers:
del self.containers[job_id]
+ msg = "waiting on: %s" % ",".join(
+ sorted(x.config.name for x in self.jobs.values())
+ )
+ if len(msg) > 80:
+ msg = "waiting on %d jobs" % len(self.jobs)
+
return (
not bool(self.jobs),
- "waiting on: %s"
- % ",".join(sorted(x.config.name for x in self.jobs.values())),
+ msg,
not bool(self.failed_jobs),
)
@@ -440,9 +447,13 @@ class TestOnefuzz:
for name in info:
logline.append("%s:%s" % (name, ",".join(info[name])))
+ msg = "waiting repro: %s" % " ".join(logline)
+ if len(logline) > 80:
+ msg = "waiting on %d repros" % len(self.repros)
+
return (
not bool(self.repros),
- "waiting repro: %s" % " ".join(logline),
+ msg,
bool(self.failed_jobs),
)
