Fix merge conflict.

Author: inferno-chromium

infra/base-images/base-libfuzzer/Dockerfile

@@ -23,7 +23,7 @@ ENV SANITIZER_FLAGS_address "-fsanitize=address"
 ENV SANITIZER_FLAGS_undefined "-fsanitize=bool,signed-integer-overflow,shift,vptr -fno-sanitize-recover=undefined"
 
 # Default build flags for coverage.
-ENV COV_FLAGS="-fsanitize-coverage=edge,indirect-calls,8bit-counters"
+ENV COVERAGE_FLAGS="-fsanitize-coverage=edge,indirect-calls,8bit-counters"
 
 # Default sanitizer and fuzzing engine to use.
 ENV SANITIZER="address"

infra/base-images/base-libfuzzer/README.md

@@ -40,6 +40,7 @@ Build configuration is performed through following environment variables:
 | -------------    | --------
 | `$SANITIZER ("address")` | Specifies sanitizer configuration to use. `address` or `undefined`.
 | `$SANITIZER_FLAGS` | Specify compiler sanitizer flags directly. Overrides `$SANITIZER`.
+| `$COVERAGE_FLAGS` | Specify compiler flags to use for fuzzer feedback coverage.
 
 # Examples
 

infra/base-images/base-libfuzzer/compile

@@ -24,7 +24,7 @@ fi
 
 bash compile_${FUZZING_ENGINE}
 
-export CFLAGS="$CFLAGS $SANITIZER_FLAGS $COV_FLAGS"
+export CFLAGS="$CFLAGS $SANITIZER_FLAGS $COVERAGE_FLAGS"
 export CXXFLAGS="$CFLAGS $CXXFLAGS_EXTRA"
 
 echo "CC=$CC"

infra/helper.py

@@ -149,6 +149,7 @@ def build_fuzzers(build_args):
   command = [
         'docker', 'run', '--rm', '-i',
         '-v', '%s:/out' % os.path.join(BUILD_DIR, 'out', args.project_name),
+        '-v', '%s:/work' % os.path.join(BUILD_DIR, 'work', args.project_name),
         '-t', 'ossfuzz/' + args.project_name,
   ]
 
@@ -294,6 +295,7 @@ def shell(shell_args):
   command = [
         'docker', 'run', '--rm', '-i',
         '-v', '%s:/out' % os.path.join(BUILD_DIR, 'out', args.project_name),
+        '-v', '%s:/work' % os.path.join(BUILD_DIR, 'work', args.project_name),
         '-t', 'ossfuzz/' + args.project_name,
         '/bin/bash'
   ]

infra/libfuzzer-pipeline.groovy

@@ -26,6 +26,9 @@ def call(body) {
     // Project configuration.
     def projectName = project["name"] ?: env.JOB_BASE_NAME
     def sanitizers = project["sanitizers"] ?: ["address"]
+    def coverageFlags = project["coverage_flags"]
+
+    // Dockerfile config
     def dockerfileConfig = project["dockerfile"] ?: [
         "path": "projects/$projectName/Dockerfile",
         "git" : "https://github.com/google/oss-fuzz.git",
@@ -83,7 +86,11 @@ def call(body) {
                 sh "mkdir -p $junit_reports"
                 stage("$sanitizer sanitizer") {
                     // Run image to produce fuzzers
-                    sh "docker run --rm --user $uid -v $out:/out -e SANITIZER=\"${sanitizer}\" -t $dockerTag compile"
+                    def env = "-e SANITIZER=\"${sanitizer}\" "
+                    if (coverageFlags != null) {
+                        env += "-e COVERAGE_FLAGS=\"${coverageFlags}\" "
+                    }
+                    sh "docker run --rm --user $uid -v $out:/out $env -t $dockerTag compile"
                     // Test all fuzzers
                     sh "docker run --rm --user $uid -v $out:/out -v $junit_reports:/junit_reports -e TEST_SUITE=\"${projectName}.${sanitizer}.\" -t ossfuzz/base-runner test_report"
                     sh "ls -al $junit_reports/"