Reapply "Shorten some paths. (#4011)" (#4023) (#4026)

This reverts commit ce12320.
I'm going to reland this after the deploy is sucessful, since I will be
deploying this change by rebuilding the images.

Author: jonathanmetzman

bot/inputs/fuzzer-testcases-disk/README.md renamed to bot/inputs/ft-disk/README.md

@@ -37,14 +37,14 @@ if [[ -z "$DISABLE_MOUNTS" ]]; then
   mount -t tmpfs -o size=10M,mode=777 tmpfs $INSTALL_DIRECTORY/clusterfuzz/bot/logs/
   mount -t tmpfs -o size=90M,mode=777 tmpfs $BOT_TMPDIR
 
-  # Setup mount to limit disk space for fuzzer-testcases-disk directory.
+  # Setup mount to limit disk space for fuzzer testcases disk directory.
   FUZZER_TESTCASES_DISK_FILE=$INSTALL_DIRECTORY/fuzzer-testcases.mnt
   fallocate -l 8GiB $FUZZER_TESTCASES_DISK_FILE
   mkfs.ext4 -F $FUZZER_TESTCASES_DISK_FILE
 
   # mkfs.ext4 seems to remove the previous allocation, so do it again.
   fallocate -l 8GiB $FUZZER_TESTCASES_DISK_FILE
-  mount -o loop $FUZZER_TESTCASES_DISK_FILE $INSTALL_DIRECTORY/clusterfuzz/bot/inputs/fuzzer-testcases-disk
+  mount -o loop $FUZZER_TESTCASES_DISK_FILE $INSTALL_DIRECTORY/clusterfuzz/bot/inputs/ft-disk
 fi
 
 chown -R $USER:$USER $INSTALL_DIRECTORY

docker/base/setup_clusterfuzz.sh

@@ -509,7 +509,7 @@ def minimize_corpus(self, target_path, arguments, input_dirs, output_dir,
     """
     runner = libfuzzer.get_runner(target_path)
     libfuzzer.set_sanitizer_options(target_path)
-    merge_tmp_dir = self._create_temp_corpus_dir('merge-workdir')
+    merge_tmp_dir = self._create_temp_corpus_dir('merge-wd')
 
     result = runner.merge(
         [output_dir] + input_dirs,

src/clusterfuzz/_internal/bot/fuzzers/libFuzzer/engine.py

@@ -970,8 +970,7 @@ def set_bot_environment():
   os.environ['DATA_BUNDLES_DIR'] = os.path.join(inputs_dir, 'data-bundles')
   os.environ['FUZZ_INPUTS'] = os.path.join(inputs_dir, 'fuzzer-testcases')
   os.environ['FUZZ_INPUTS_MEMORY'] = os.environ['FUZZ_INPUTS']
-  os.environ['FUZZ_INPUTS_DISK'] = os.path.join(inputs_dir,
-                                                'fuzzer-testcases-disk')
+  os.environ['FUZZ_INPUTS_DISK'] = os.path.join(inputs_dir, 'ft-disk')
   os.environ['FUZZ_DATA'] = os.path.join(inputs_dir,
                                          'fuzzer-common-data-bundles')
   os.environ['IMAGES_DIR'] = os.path.join(inputs_dir, 'images')

src/clusterfuzz/_internal/system/environment.py

@@ -1,4 +1,4 @@
-/mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-asan_linux-release_4392242b7f59878a2775b4607420a2b37e17ff13/symbolized/release/asan-linux-release-405858/chrome --user-data-dir=/mnt/scratch0/tmp/user_profile_0 --js-flags="--expose-gc --verify-heap" --no-first-run --use-gl=osmesa /mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/fuzz-674-1.1.1.id_001443,src_001221,op_arith32,pos_204,val_-2.bmp
+/mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-asan_linux-release_4392242b7f59878a2775b4607420a2b37e17ff13/symbolized/release/asan-linux-release-405858/chrome --user-data-dir=/mnt/scratch0/tmp/user_profile_0 --js-flags="--expose-gc --verify-heap" --no-first-run --use-gl=osmesa /mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/fuzz-674-1.1.1.id_001443,src_001221,op_arith32,pos_204,val_-2.bmp
 
 [Crash Revision] r405858
 [Environment] ASAN_OPTIONS = redzone=1024:symbolize=0:detect_stack_use_after_return=1:alloc_dealloc_mismatch=0:print_scariness=1:check_malloc_usable_size=0:max_uar_stack_size_log=16:use_sigaltstack=1:strict_memcmp=0:detect_container_overflow=1:allocator_may_return_null=1:coverage=0:detect_odr_violation=0:fast_unwind_on_fatal=1:handle_segv=1:malloc_context_size=128

src/clusterfuzz/_internal/tests/appengine/libs/issue_filer_data/memory_tools_asan.txt

@@ -4,7 +4,7 @@ python  /mnt/scratch0/clusterfuzz/bot/inputs/fuzzers/afl/launcher.py /mnt/scratc
 [Environment] ASAN_OPTIONS = redzone=16:symbolize=0:detect_stack_use_after_return=1:alloc_dealloc_mismatch=0:detect_leaks=1:print_scariness=1:check_malloc_usable_size=0:max_uar_stack_size_log=16:use_sigaltstack=1:strict_memcmp=0:detect_container_overflow=1:coverage=0:detect_odr_violation=0:allocator_may_return_null=1:handle_segv=1:fast_unwind_on_fatal=1
 [Environment] LSAN_OPTIONS = suppressions=/mnt/scratch0/clusterfuzz/scripts/suppressions/lsan_suppressions.txt
 
-Command: [/mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-afl_linux-release-asan_ea2fe5dc76ad0840fb2bae7b6047f82cd9605438/revisions/afl-linux-release-406205/afl-fuzz, -d, -i/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-common-data-bundles/skia_path_fuzzer, -o/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/temp/output, -mnone, /mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-afl_linux-release-asan_ea2fe5dc76ad0840fb2bae7b6047f82cd9605438/revisions/afl-linux-release-406205/skia_path_fuzzer, 2147483647]
+Command: [/mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-afl_linux-release-asan_ea2fe5dc76ad0840fb2bae7b6047f82cd9605438/revisions/afl-linux-release-406205/afl-fuzz, -d, -i/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-common-data-bundles/skia_path_fuzzer, -o/mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/temp/output, -mnone, /mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-afl_linux-release-asan_ea2fe5dc76ad0840fb2bae7b6047f82cd9605438/revisions/afl-linux-release-406205/skia_path_fuzzer, 2147483647]
 Bot: clusterfuzz-linux-pre-0424
 Time ran: 146.950697899
 minimizing corpus

src/clusterfuzz/_internal/tests/appengine/libs/issue_filer_data/memory_tools_asan_afl.txt

@@ -3,7 +3,7 @@ python  /mnt/scratch0/clusterfuzz/bot/inputs/fuzzers/libfuzzer/libFuzzer/launche
 [Crash Revision] r406546
 [Environment] MSAN_OPTIONS = print_stats=1:symbolize=1:coverage=0
 
-Command: [/mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-libfuzzer_linux-release-msan_ae530a86793cd6b8b56ce9af9159ac101396e802/revisions/libfuzzer-linux-release-406546/skia_pathop_fuzzer, -max_len=512, -timeout=300, -rss_limit_mb=3000, -max_total_time=3250, -print_final_stats=1, /mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/temp/new, /mnt/scratch0/clusterfuzz/bot/inputs/fuzzers/libfuzzer/libfuzzer_data/skia_pathop_fuzzer]
+Command: [/mnt/scratch0/clusterfuzz/bot/builds/chromium-browser-libfuzzer_linux-release-msan_ae530a86793cd6b8b56ce9af9159ac101396e802/revisions/libfuzzer-linux-release-406546/skia_pathop_fuzzer, -max_len=512, -timeout=300, -rss_limit_mb=3000, -max_total_time=3250, -print_final_stats=1, /mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/temp/new, /mnt/scratch0/clusterfuzz/bot/inputs/fuzzers/libfuzzer/libfuzzer_data/skia_pathop_fuzzer]
 Bot: clusterfuzz-linux-pre-0506
 Time ran: 18.475050
 

src/clusterfuzz/_internal/tests/appengine/libs/issue_filer_data/memory_tools_msan_libfuzzer.txt

@@ -1,6 +1,6 @@
 Temporary input directory contains 150 files, Original contains 14500.
 Afl exited with a nonzero exitcode 1
-Fuzz cmd ['/mnt/scratch0/clusterfuzz/resources/platform/linux/minijail0', '-f', '/tmp/tmpnkHou2', '-U', '-m', '0 1337 1', '-T', 'static', '-c', '0', '-n', '-e', '-v', '-p', '-l', '-I', '-k', 'proc,/proc,proc,1', '-P', '/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/temp/tmpEMM8L8', '-b', '/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/temp/tmpP8_FDL,/tmp,1', '-b', '/lib,/lib,0', '-b', '/lib64,/lib64,0', '-b', '/usr/lib,/usr/lib,0', '-b', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions,/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions,0', '-b', '/bin,/bin,0', '-b', '/usr/bin,/usr/bin,0', '-b', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions,/out,0', '-b', '/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/temp/afl_input_dir,/afl_input_dir,1', '-b', '/mnt/scratch0/clusterfuzz/bot/inputs/fuzzer-testcases-disk/temp/afl_output_dir,/afl_output_dir,1', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions/afl-fuzz', '-d', '-i/afl_input_dir', '-o/afl_output_dir', '-mnone', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions/slkfuzzer', '2147483647']
+Fuzz cmd ['/mnt/scratch0/clusterfuzz/resources/platform/linux/minijail0', '-f', '/tmp/tmpnkHou2', '-U', '-m', '0 1337 1', '-T', 'static', '-c', '0', '-n', '-e', '-v', '-p', '-l', '-I', '-k', 'proc,/proc,proc,1', '-P', '/mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/temp/tmpEMM8L8', '-b', '/mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/temp/tmpP8_FDL,/tmp,1', '-b', '/lib,/lib,0', '-b', '/lib64,/lib64,0', '-b', '/usr/lib,/usr/lib,0', '-b', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions,/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions,0', '-b', '/bin,/bin,0', '-b', '/usr/bin,/usr/bin,0', '-b', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions,/out,0', '-b', '/mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/temp/afl_input_dir,/afl_input_dir,1', '-b', '/mnt/scratch0/clusterfuzz/bot/inputs/ft-disk/temp/afl_output_dir,/afl_output_dir,1', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions/afl-fuzz', '-d', '-i/afl_input_dir', '-o/afl_output_dir', '-mnone', '/mnt/scratch0/clusterfuzz/bot/builds/clusterfuzz-builds-afl_libreoffice_1722507a6b01db31fdc90b1e6c8b4b5d1d41878b/revisions/slkfuzzer', '2147483647']
 Output [0;36mafl-fuzz [1;97m2.52b[0m by <[email protected]>
 [1;92m[+] [0mLooks like we're not running on a tty, so I'll be a bit less verbose.[0m
 [1;92m[+] [0mYou have 1 CPU core and 2 runnable tasks (utilization: 200%).[0m

src/clusterfuzz/_internal/tests/core/bot/fuzzers/afl/stats_data/startup_crash.txt

@@ -288,7 +288,7 @@ def mock_merge(*args, **kwargs):  # pylint: disable=unused-argument
 
     result = engine_impl.fuzz('/target', options, '/fake', 3600)
     self.assertEqual(1, len(result.crashes))
-    self.assertEqual(fuzz_output, result.logs)
+    self.assertEqual(fuzz_output.strip('\n'), result.logs.strip('\n'))
 
     crash = result.crashes[0]
     self.assertEqual('/fake/crash-1e15825e6f0b2240a5af75d84214adda1b6b5340',
@@ -323,11 +323,11 @@ def mock_merge(*args, **kwargs):  # pylint: disable=unused-argument
         additional_args=[
             '-arg=1',
             '-timeout=123',
-            '-merge_control_file=/fuzz-inputs/temp-9001/merge-workdir/MCF',
+            '-merge_control_file=/fuzz-inputs/temp-9001/merge-wd/MCF',
         ],
         artifact_prefix=None,
         merge_timeout=1800.0,
-        tmp_dir='/fuzz-inputs/temp-9001/merge-workdir')
+        tmp_dir='/fuzz-inputs/temp-9001/merge-wd')
 
     mock_merge_calls[1].assert_called_with(
         mock.ANY, [
@@ -338,11 +338,11 @@ def mock_merge(*args, **kwargs):  # pylint: disable=unused-argument
         additional_args=[
             '-arg=1',
             '-timeout=123',
-            '-merge_control_file=/fuzz-inputs/temp-9001/merge-workdir/MCF',
+            '-merge_control_file=/fuzz-inputs/temp-9001/merge-wd/MCF',
         ],
         artifact_prefix=None,
         merge_timeout=1800.0,
-        tmp_dir='/fuzz-inputs/temp-9001/merge-workdir')
+        tmp_dir='/fuzz-inputs/temp-9001/merge-wd')
 
     self.assertDictEqual({
         'actual_duration': 2,

src/clusterfuzz/_internal/tests/core/bot/fuzzers/libFuzzer/engine_test.py

@@ -1,11 +1,11 @@
-Command: 'c:\clusterfuzz\bot\builds\chromium-browser-libfuzzer_win32-release_x64-asan_4834a5339bd661fb993ed9448e3738d3c07ca989\revisions\libfuzzer-win32-release_x64-599761\mediasource_MP3_pipeline_integration_fuzzer.exe' -timeout=25 -rss_limit_mb=2048 '-artifact_prefix=c:\clusterfuzz\bot\inputs\fuzzer-testcases/' -max_total_time=2650 -print_final_stats=1 'c:\clusterfuzz\bot\inputs\fuzzer-testcases-disk\temp\new' 'c:\clusterfuzz\bot\inputs\data-bundles\global\mediasource_MP3_pipeline_integration_fuzzer'
+Command: 'c:\clusterfuzz\bot\builds\chromium-browser-libfuzzer_win32-release_x64-asan_4834a5339bd661fb993ed9448e3738d3c07ca989\revisions\libfuzzer-win32-release_x64-599761\mediasource_MP3_pipeline_integration_fuzzer.exe' -timeout=25 -rss_limit_mb=2048 '-artifact_prefix=c:\clusterfuzz\bot\inputs\fuzzer-testcases/' -max_total_time=2650 -print_final_stats=1 'c:\clusterfuzz\bot\inputs\ft-disk\temp\new' 'c:\clusterfuzz\bot\inputs\data-bundles\global\mediasource_MP3_pipeline_integration_fuzzer'
 Bot: clusterfuzz-windows-zone2-pre-w93p
 Time ran: 29.046000
 
 INFO: Seed: 1776138335
 INFO: Loaded 1 modules   (685270 inline 8-bit counters): 685270 [00007FF72FB8CE48, 00007FF72FC3431E),
 INFO: Loaded 1 PC tables (685270 PCs): 685270 [00007FF72ED0F248,00007FF72F783FA8),
-INFO:        0 files found in c:\clusterfuzz\bot\inputs\fuzzer-testcases-disk\temp\new
+INFO:        0 files found in c:\clusterfuzz\bot\inputs\ft-disk\temp\new
 INFO:     4060 files found in c:\clusterfuzz\bot\inputs\data-bundles\global\mediasource_MP3_pipeline_integration_fuzzer
 INFO: -max_len is not provided; libFuzzer will not generate inputs larger than 1048576 bytes
 INFO: seed corpus: files: 4060 min: 1b max: 1048576b total: 205545310b rss: 93Mb