[CFL] Set CLUSTERFUZZLITE variable when building and running

Related: #77

Author: jonathanmetzman

infra/cifuzz/base_runner_utils.py

@@ -26,6 +26,7 @@ def get_env(config, workspace):
   env['FUZZING_LANGUAGE'] = config.language
   env['OUT'] = workspace.out
   env['CIFUZZ'] = 'True'
+  env['CLUSTERFUZZLITE'] = 'True'
   env['FUZZING_ENGINE'] = config_utils.DEFAULT_ENGINE
   env['ARCHITECTURE'] = config_utils.DEFAULT_ARCHITECTURE
   # Do this so we don't fail in tests.

infra/cifuzz/build_fuzzers_test.py

@@ -64,8 +64,8 @@ class BuildFuzzersTest(unittest.TestCase):
   @mock.patch('repo_manager._clone', return_value=None)
   @mock.patch('continuous_integration.checkout_specified_commit')
   @mock.patch('helper.docker_run', return_value=False)  # We want to quit early.
-  def test_cifuzz_env_var(self, mock_docker_run, _, __, ___):
-    """Tests that the CIFUZZ env var is set."""
+  def test_cifuzz_clusterfuzzlite_env_var(self, mock_docker_run, _, __, ___):
+    """Tests that the CIFUZZ and CLUSTERFUZZLITE env vars are set."""
 
     with tempfile.TemporaryDirectory() as tmp_dir:
       build_fuzzers.build_fuzzers(
@@ -87,6 +87,8 @@ def command_has_env_var_arg(command, env_var_arg):
       return False
 
     self.assertTrue(command_has_env_var_arg(docker_run_command, 'CIFUZZ=True'))
+    self.assertTrue(
+        command_has_env_var_arg(docker_run_command, 'CLUSTERFUZZLITE=True'))
 
 
 class InternalGithubBuildTest(unittest.TestCase):

infra/cifuzz/docker.py

@@ -29,7 +29,8 @@
 # Default fuzz configuration.
 _DEFAULT_DOCKER_RUN_ARGS = [
     '-e', 'FUZZING_ENGINE=' + constants.DEFAULT_ENGINE, '-e',
-    'ARCHITECTURE=' + constants.DEFAULT_ARCHITECTURE, '-e', 'CIFUZZ=True'
+    'ARCHITECTURE=' + constants.DEFAULT_ARCHITECTURE, '-e', 'CIFUZZ=True', '-e',
+    'CLUSTERFUZZLITE=True'
 ]
 
 EXTERNAL_PROJECT_IMAGE = 'external-project'

infra/cifuzz/docker_test.py

@@ -73,6 +73,8 @@ def test_get_base_docker_run_args_container(self, _):
         '-e',
         'CIFUZZ=True',
         '-e',
+        'CLUSTERFUZZLITE=True',
+        '-e',
         f'SANITIZER={SANITIZER}',
         '-e',
         f'FUZZING_LANGUAGE={LANGUAGE}',
@@ -92,8 +94,9 @@ def test_get_base_docker_run_args_no_container(self, _):
     self.assertEqual(docker_container, None)
     expected_docker_args = [
         '-e', 'FUZZING_ENGINE=libfuzzer', '-e', 'ARCHITECTURE=x86_64', '-e',
-        'CIFUZZ=True', '-e', f'SANITIZER={SANITIZER}', '-e',
-        f'FUZZING_LANGUAGE={LANGUAGE}', '-e', f'OUT={WORKSPACE.out}', '-v',
+        'CIFUZZ=True', '-e', 'CLUSTERFUZZLITE=True',
+        '-e', f'SANITIZER={SANITIZER}', '-e', f'FUZZING_LANGUAGE={LANGUAGE}',
+        '-e', f'OUT={WORKSPACE.out}', '-v',
         f'{WORKSPACE.workspace}:{WORKSPACE.workspace}'
     ]
     self.assertEqual(docker_args, expected_docker_args)
@@ -112,8 +115,9 @@ def test_get_base_docker_run_command_no_container(self, _):
     expected_docker_command = [
         'docker', 'run', '--rm', '--privileged', '-e',
         'FUZZING_ENGINE=libfuzzer', '-e', 'ARCHITECTURE=x86_64', '-e',
-        'CIFUZZ=True', '-e', f'SANITIZER={SANITIZER}', '-e',
-        f'FUZZING_LANGUAGE={LANGUAGE}', '-e', f'OUT={WORKSPACE.out}', '-v',
+        'CIFUZZ=True', '-e', 'CLUSTERFUZZLITE=True', '-e',
+        f'SANITIZER={SANITIZER}', '-e', f'FUZZING_LANGUAGE={LANGUAGE}', '-e',
+        f'OUT={WORKSPACE.out}', '-v',
         f'{WORKSPACE.workspace}:{WORKSPACE.workspace}'
     ]
     self.assertEqual(docker_args, expected_docker_command)

infra/cifuzz/generate_coverage_report_test.py

@@ -43,6 +43,7 @@ def test_run_coverage_command(self, mock_execute):  # pylint: disable=no-self-us
         'FUZZING_LANGUAGE': config.language,
         'OUT': workspace.out,
         'CIFUZZ': 'True',
+        'CLUSTERFUZZLITE': 'True',
         'FUZZING_ENGINE': 'libfuzzer',
         'ARCHITECTURE': 'x86_64',
         'FUZZER_ARGS': '-rss_limit_mb=2560 -timeout=25',