diff --git a/common/benchmark_utils.py b/common/benchmark_utils.py index e9d95f6d9..7f91f0be8 100644 --- a/common/benchmark_utils.py +++ b/common/benchmark_utils.py @@ -132,8 +132,14 @@ def get_all_benchmarks(): return sorted(all_benchmarks) +def get_coverage_benchmarks(): + """Returns the list of all coverage benchmarks.""" + return (get_oss_fuzz_coverage_benchmarks() + + get_standard_coverage_benchmarks()) + + def get_oss_fuzz_coverage_benchmarks(): - """Return the list of OSS-Fuzz coverage benchmarks.""" + """Returns the list of OSS-Fuzz coverage benchmarks.""" return [ benchmark for benchmark in get_all_benchmarks() if is_oss_fuzz_benchmark(benchmark) and @@ -142,7 +148,7 @@ def get_oss_fuzz_coverage_benchmarks(): def get_standard_coverage_benchmarks(): - """Return the list of standard coverage benchmarks.""" + """Returns the list of standard coverage benchmarks.""" return [ benchmark for benchmark in get_all_benchmarks() if not is_oss_fuzz_benchmark(benchmark) and @@ -151,7 +157,7 @@ def get_standard_coverage_benchmarks(): def get_bug_benchmarks(): - """Return the list of standard coverage benchmarks.""" + """Returns the list of standard bug benchmarks.""" return [ benchmark for benchmark in get_all_benchmarks() if get_type(benchmark) == BenchmarkType.BUG.value diff --git a/experiment/run_experiment.py b/experiment/run_experiment.py index 9971f173f..c90f0eb00 100644 --- a/experiment/run_experiment.py +++ b/experiment/run_experiment.py @@ -473,14 +473,15 @@ def main(): 'more benchmarks.') all_benchmarks = benchmark_utils.get_all_benchmarks() - all_fuzzers = fuzzer_utils.get_fuzzer_names() - + coverage_benchmarks = benchmark_utils.get_coverage_benchmarks() parser.add_argument('-b', '--benchmarks', - help='Benchmark names. All of them by default.', + help=('Benchmark names. ' + 'All code coverage benchmarks of them by ' + 'default.'), nargs='+', required=False, - default=all_benchmarks, + default=coverage_benchmarks, choices=all_benchmarks) parser.add_argument('-c', '--experiment-config', @@ -494,6 +495,8 @@ def main(): '--description', help='Description of the experiment.', required=False) + + all_fuzzers = fuzzer_utils.get_fuzzer_names() parser.add_argument('-f', '--fuzzers', help='Fuzzers to use.',