Find fuzz target binary under build.out

Author: DonggeLiu

infra/build/functions/target_experiment.py

@@ -30,8 +30,7 @@
 
 def run_experiment(project_name, target_name, args, output_path,
                    build_output_path, upload_corpus_path, upload_coverage_path,
-                   experiment_name, local_artifact_path,
-                   upload_reproducer_path):
+                   experiment_name, upload_reproducer_path):
   config = build_project.Config(testing=True,
                                 test_image_suffix='',
                                 repo=build_project.DEFAULT_OSS_FUZZ_REPO,
@@ -75,10 +74,10 @@ def run_experiment(project_name, target_name, args, output_path,
   local_output_path = '/workspace/output.log'
   local_corpus_path_base = '/workspace/corpus'
   local_corpus_path = os.path.join(local_corpus_path_base, target_name)
-  local_target_path = os.path.join(build.out, target_name)
+  default_target_path = os.path.join(build.out, target_name)
+  local_target_dir = os.path.join(build.out, 'target')
   local_corpus_zip_path = '/workspace/corpus/corpus.zip'
-  if not local_artifact_path:
-    local_artifact_path = os.path.join(build.out, 'artifacts')
+  local_artifact_path = os.path.join(build.out, 'artifacts')
   fuzzer_args = ' '.join(args + [f'-artifact_prefix={local_artifact_path}'])
 
   env = build_project.get_env(project_yaml['language'], build)
@@ -94,6 +93,7 @@ def run_experiment(project_name, target_name, args, output_path,
           'bash',
           '-c',
           (f'mkdir -p {local_corpus_path} && '
+           f'mkdir -p {local_target_dir} && '
            f'mkdir -p {local_artifact_path} && '
            f'run_fuzzer {target_name} {fuzzer_args} '
            f'|& tee {local_output_path} || true'),
@@ -120,31 +120,38 @@ def run_experiment(project_name, target_name, args, output_path,
       ],
   })
 
-  # Upload binary.
-  steps.append({
-      'name':
-          'gcr.io/cloud-builders/gsutil',
-      'entrypoint':
-          '/bin/bash',
-      'args': [
-          '-c',
-          (f'gsutil cp {local_target_path} '
-           f'{upload_reproducer_path}/{target_name} || true'),
-      ],
-  })
+  if upload_reproducer_path:
+    # Upload binary. First copy the binary directly from default_target_path,
+    # if that fails, find it under build out dir and copy to local_target_dir.
+    # If either succeeds, then upload it to bucket.
+    # If multiple files are found, suffix them and upload them all.
+    steps.append({
+        'name':
+            'gcr.io/cloud-builders/gsutil',
+        'entrypoint':
+            '/bin/bash',
+        'args': [
+            '-c',
+            (f'cp {default_target_path} {local_target_dir} 2>/dev/null || '
+             f'find {build.out} -type f -name {target_name} -exec bash -c '
+             f'\'cp "$0" "{local_target_dir}/$(basename "$0")_$(date +%s%N)"\' '
+             f'{{}} \\; && gsutil cp -r {local_target_dir} '
+             f'{upload_reproducer_path}/{target_name} || true'),
+        ],
+    })
 
-  # Upload reproducer.
-  steps.append({
-      'name':
-          'gcr.io/cloud-builders/gsutil',
-      'entrypoint':
-          '/bin/bash',
-      'args': [
-          '-c',
-          (f'gsutil -m cp -r {local_artifact_path} {upload_reproducer_path} || '
-           'true'),
-      ],
-  })
+    # Upload reproducer.
+    steps.append({
+        'name':
+            'gcr.io/cloud-builders/gsutil',
+        'entrypoint':
+            '/bin/bash',
+        'args': [
+            '-c',
+            (f'gsutil -m cp -r {local_artifact_path} {upload_reproducer_path} '
+             '|| true'),
+        ],
+    })
 
   # Build for coverage.
   build = build_project.Build('libfuzzer', 'coverage', 'x86_64')
@@ -245,24 +252,21 @@ def main():
                       required=True,
                       help='GCS location to upload corpus.')
   parser.add_argument('--upload_reproducer',
-                      required=True,
+                      required=False,
+                      default='',
                       help='GCS location to upload reproducer.')
   parser.add_argument('--upload_coverage',
                       required=True,
                       help='GCS location to upload coverage data.')
   parser.add_argument('--experiment_name',
                       required=True,
                       help='Experiment name.')
-  parser.add_argument('--local_artifact_path',
-                      required=False,
-                      default='',
-                      help='libFuzzer local artifact directory.')
   args = parser.parse_args()
 
   run_experiment(args.project, args.target, args.args, args.upload_output_log,
                  args.upload_build_log, args.upload_corpus,
                  args.upload_coverage, args.experiment_name,
-                 args.local_artifact_path, args.upload_reproducer)
+                 args.upload_reproducer)
 
 
 if __name__ == '__main__':