From 54e2b966035205ad3178239fa2e3ecca4fc21235 Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Mon, 11 Jul 2022 11:43:50 +0200
Subject: Remove build-infra support for DFSan. (#7971)

Related: #7964
---
 infra/build/functions/build_and_run_coverage.py |  2 --
 infra/build/functions/build_lib.py              |  4 ---
 infra/build/functions/build_project.py          | 39 -------------------------
 3 files changed, 45 deletions(-)

diff --git a/infra/build/functions/build_and_run_coverage.py b/infra/build/functions/build_and_run_coverage.py
index 7c0ae078..14711804 100755
--- a/infra/build/functions/build_and_run_coverage.py
+++ b/infra/build/functions/build_and_run_coverage.py
@@ -130,8 +130,6 @@ def get_build_steps(  # pylint: disable=too-many-locals, too-many-arguments
       'HTTP_PORT=',
       f'COVERAGE_EXTRA_ARGS={project.coverage_extra_args.strip()}',
   ]
-  if 'dataflow' in project.fuzzing_engines:
-    coverage_env.append('FULL_SUMMARY_PER_TARGET=1')
 
   build_steps.append({
       'name':
diff --git a/infra/build/functions/build_lib.py b/infra/build/functions/build_lib.py
index b82d05ad..8a2f99b0 100644
--- a/infra/build/functions/build_lib.py
+++ b/infra/build/functions/build_lib.py
@@ -64,10 +64,6 @@ ENGINE_INFO = {
         EngineInfo(upload_bucket='clusterfuzz-builds-honggfuzz',
                    supported_sanitizers=['address'],
                    supported_architectures=['x86_64']),
-    'dataflow':
-        EngineInfo(upload_bucket='clusterfuzz-builds-dataflow',
-                   supported_sanitizers=['dataflow'],
-                   supported_architectures=['x86_64']),
     'none':
         EngineInfo(upload_bucket='clusterfuzz-builds-no-engine',
                    supported_sanitizers=['address'],
diff --git a/infra/build/functions/build_project.py b/infra/build/functions/build_project.py
index e2760a2e..1b9d024f 100755
--- a/infra/build/functions/build_project.py
+++ b/infra/build/functions/build_project.py
@@ -331,15 +331,6 @@ def get_build_steps(  # pylint: disable=too-many-locals, too-many-statements, to
               ],
           })
 
-        if build.sanitizer == 'dataflow' and build.fuzzing_engine == 'dataflow':
-          dataflow_steps = dataflow_post_build_steps(project.name, env,
-                                                     base_images_project,
-                                                     config.test_image_suffix)
-          if dataflow_steps:
-            build_steps.extend(dataflow_steps)
-          else:
-            sys.stderr.write('Skipping dataflow post build steps.\n')
-
         build_steps.extend([
             # Generate targets list.
             {
@@ -457,36 +448,6 @@ def get_runner_image_name(base_images_project, test_image_suffix):
   return image
 
 
-def dataflow_post_build_steps(project_name, env, base_images_project,
-                              test_image_suffix):
-  """Appends dataflow post build steps."""
-  steps = build_lib.download_corpora_steps(project_name)
-  if not steps:
-    return None
-
-  steps.append({
-      'name':
-          get_runner_image_name(base_images_project, test_image_suffix),
-      'env':
-          env + [
-              'COLLECT_DFT_TIMEOUT=2h',
-              'DFT_FILE_SIZE_LIMIT=65535',
-              'DFT_MIN_TIMEOUT=2.0',
-              'DFT_TIMEOUT_RANGE=6.0',
-          ],
-      'args': [
-          'bash', '-c',
-          ('for f in /corpus/*.zip; do unzip -q $f -d ${f%%.*}; done && '
-           'collect_dft || (echo "DFT collection failed." && false)')
-      ],
-      'volumes': [{
-          'name': 'corpus',
-          'path': '/corpus'
-      }],
-  })
-  return steps
-
-
 # pylint: disable=no-member,too-many-arguments
 def run_build(oss_fuzz_project,
               build_steps,
-- 
cgit v1.2.3