From cbc4293c371594bf2e737f36f4e66706dbafad4e Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <meumertzheim@code-intelligence.com>
Date: Tue, 18 May 2021 18:15:14 +0200
Subject: [PATCH] [infra] Make mount location configurable in build_fuzzers
 (#5744)

Exposing the mount location for local sources to a command-line
argument makes it possible to reproduce findings with local source
even for umbrella projects with WORKDIR $SRC/.
---
 infra/build_specified_commit.py |  2 +-
 infra/helper.py                 | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/infra/build_specified_commit.py b/infra/build_specified_commit.py
index 70563db3f..798010b7b 100644
--- a/infra/build_specified_commit.py
+++ b/infra/build_specified_commit.py
@@ -230,7 +230,7 @@ def build_fuzzers_from_commit(commit,
                                        architecture=build_data.architecture,
                                        env_to_add=None,
                                        source_path=host_src_path,
-                                       mount_location='/src')
+                                       mount_path='/src')
     if result or i == num_retry:
       break
 
diff --git a/infra/helper.py b/infra/helper.py
index ee476d1e6..dd28abb70 100755
--- a/infra/helper.py
+++ b/infra/helper.py
@@ -153,6 +153,10 @@ def get_parser():  # pylint: disable=too-many-statements
   build_fuzzers_parser.add_argument('source_path',
                                     help='path of local source',
                                     nargs='?')
+  build_fuzzers_parser.add_argument('--mount_path',
+                                    dest='mount_path',
+                                    help='path to mount local source in '
+                                    '(defaults to WORKDIR)')
   build_fuzzers_parser.add_argument('--clean',
                                     dest='clean',
                                     action='store_true',
@@ -519,7 +523,7 @@ def build_fuzzers_impl(  # pylint: disable=too-many-arguments,too-many-locals,to
     env_to_add,
     source_path,
     no_cache=False,
-    mount_location=None):
+    mount_path=None):
   """Builds fuzzers."""
   if not build_image_impl(project_name, no_cache=no_cache):
     return False
@@ -574,10 +578,10 @@ def build_fuzzers_impl(  # pylint: disable=too-many-arguments,too-many-locals,to
   command = ['--cap-add', 'SYS_PTRACE'] + _env_to_docker_args(env)
   if source_path:
     workdir = _workdir_from_dockerfile(project_name)
-    if mount_location:
+    if mount_path:
       command += [
           '-v',
-          '%s:%s' % (_get_absolute_path(source_path), mount_location),
+          '%s:%s' % (_get_absolute_path(source_path), mount_path),
       ]
     else:
       if workdir == '/src':
@@ -618,9 +622,14 @@ def build_fuzzers_impl(  # pylint: disable=too-many-arguments,too-many-locals,to
 
 def build_fuzzers(args):
   """Builds fuzzers."""
-  return build_fuzzers_impl(args.project_name, args.clean, args.engine,
-                            args.sanitizer, args.architecture, args.e,
-                            args.source_path)
+  return build_fuzzers_impl(args.project_name,
+                            args.clean,
+                            args.engine,
+                            args.sanitizer,
+                            args.architecture,
+                            args.e,
+                            args.source_path,
+                            mount_path=args.mount_path)
 
 
 def _add_oss_fuzz_ci_if_needed(env):