SERVER-25708 LLVM symbolizer not present in PATH during multiversion suites on ASan and UBSan variants

1 files changed, 17 insertions, 9 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index b99b81f6b57..fc1cffb3ec5 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -374,7 +374,15 @@ functions:
         fi
         set -o errexit
 
-        ${resmoke_wrapper} ${path_prefix} ${san_symbolizer} ${san_options} ${rlp_environment} ${python|python} buildscripts/resmoke.py ${resmoke_args} $extra_args ${test_flags} --log=buildlogger --reportFile=report.json
+        path_value="$PATH"
+        if [ ${variant_path_suffix} ]; then
+          path_value="$path_value:${variant_path_suffix}"
+        fi
+        if [ ${task_path_suffix} ]; then
+          path_value="$path_value:${task_path_suffix}"
+        fi
+
+        ${resmoke_wrapper} PATH="$path_value" ${san_symbolizer} ${san_options} ${rlp_environment} ${python|python} buildscripts/resmoke.py ${resmoke_args} $extra_args ${test_flags} --log=buildlogger --reportFile=report.json
 
         if [ "Windows_NT" = "$OS" ]; then
           # Sentinel file to indicate that resmoke succeeded.
@@ -1081,7 +1089,7 @@ tasks:
   - func: "do multiversion setup"
   - func: "run tests"
     vars:
-      path_prefix: PATH=$PATH:/data/multiversion
+      task_path_suffix: /data/multiversion
       resmoke_wrapper: ${python|python} buildscripts/burn_in_tests.py --testListFile=jstests/new_tests.json
       resmoke_args: --repeat=2
       run_multiple_jobs: true
@@ -1776,7 +1784,7 @@ tasks:
   - func: "do multiversion setup"
   - func: "run tests"
     vars:
-      path_prefix: PATH=$PATH:/data/multiversion
+      task_path_suffix: /data/multiversion
       resmoke_args: --suites=multiversion --storageEngine=mmapv1 --excludeWithAnyTags=requires_wiredtiger
       run_multiple_jobs: true
 
@@ -1787,7 +1795,7 @@ tasks:
   - func: "do multiversion setup"
   - func: "run tests"
     vars:
-      path_prefix: PATH=$PATH:/data/multiversion
+      task_path_suffix: /data/multiversion
       resmoke_args: --suites=multiversion --storageEngine=wiredTiger --excludeWithAnyTags=requires_mmapv1
       run_multiple_jobs: true
 
@@ -1798,7 +1806,7 @@ tasks:
   - func: "do multiversion setup"
   - func: "run tests"
     vars:
-      path_prefix: PATH=$PATH:/data/multiversion
+      task_path_suffix: /data/multiversion
       resmoke_args: --suites=multiversion_multistorage_engine
       run_multiple_jobs: true
 
@@ -2253,7 +2261,7 @@ tasks:
   - func: "do multiversion setup"
   - func: "run tests"
     vars:
-      path_prefix: PATH=$PATH:/data/multiversion
+      task_path_suffix: /data/multiversion
       resmoke_args: --suites=sharding_last_stable_mongos_and_mixed_shards
       run_multiple_jobs: true
 
@@ -7510,7 +7518,7 @@ buildvariants:
   expansions:
     tooltags: "-tags 'ssl'"
     # We need llvm-symbolizer in the PATH for ASAN for clang-3.7 or later.
-    path_prefix: PATH=$PATH:/usr/lib/llvm-3.8/bin
+    variant_path_suffix: /usr/lib/llvm-3.8/bin
     san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions" ASAN_OPTIONS=detect_leaks=1
     compile_flags: CC=/usr/bin/clang-3.8 CXX=/usr/bin/clang++-3.8 CPPDEFINES="_GLIBCXX_USE_CXX11_ABI=0" --dbg=on --opt=on --allocator=system --sanitize=address --ssl -j$(grep -c ^processor /proc/cpuinfo) --nostrip VARIANT_DIR=build
     num_jobs_available: $(($(grep -c ^processor /proc/cpuinfo) / 3)) # Avoid starting too many mongod's under ASAN build.
@@ -7646,7 +7654,7 @@ buildvariants:
   expansions:
     tooltags: "-tags 'ssl'"
     # We need llvm-symbolizer in the PATH for ASAN for clang-3.7 or later.
-    path_prefix: PATH=$PATH:/usr/lib/llvm-3.8/bin
+    variant_path_suffix: /usr/lib/llvm-3.8/bin
     san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions" ASAN_OPTIONS=detect_leaks=1
     compile_flags: CC=/usr/bin/clang-3.8 CXX=/usr/bin/clang++-3.8 CPPDEFINES="_GLIBCXX_USE_CXX11_ABI=0" --opt=on --allocator=system --sanitize=address --ssl -j$(grep -c ^processor /proc/cpuinfo) --nostrip VARIANT_DIR=build
     num_jobs_available: $(($(grep -c ^processor /proc/cpuinfo) / 3)) # Avoid starting too many mongod's under ASAN build.
@@ -7674,7 +7682,7 @@ buildvariants:
   batchtime: 1440 # 1 day
   expansions:
     # We need llvm-symbolizer in the PATH for UBSAN.
-    path_prefix: PATH=$PATH:/usr/lib/llvm-3.8/bin
+    variant_path_suffix: /usr/lib/llvm-3.8/bin
     gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
     tooltags: "-tags 'ssl sasl'"
     san_options: UBSAN_OPTIONS="print_stacktrace=1"