SERVER-42575 compiling and running unittests should be a single task

(cherry picked from commit 9cad3bfc3324b050f8f85cfdd80e7f0c0c95c1a5)
(cherry picked from commit 75a5018fe51643004dbfdd0d79c07f17ba9a1aa7)

1 files changed, 4 insertions, 214 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index cb226e05748..5211818cb55 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -194,18 +194,6 @@ variables:
   - benchrun_embedded_update
   - generate_benchrun_embedded_files
 
-- &unittests
-  name: unittests!
-  execution_tasks:
-  - compile_unittests
-  - unittests
-
-- &dbtest
-  name: dbtest!
-  execution_tasks:
-  - compile_dbtest
-  - dbtest
-
 - &compile_task_group_template
   name: compile_task_group_template
   max_hosts: 1
@@ -277,9 +265,6 @@ variables:
   - windows-64-vs2015-small
   modules:
   - enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   expansions: &enterprise-windows-64-2k8-nopush-expansions-template
     test_flags: --excludeWithAnyTags=requires_mmapv1
     platform_decompress: unzip
@@ -3434,18 +3419,14 @@ tasks:
         display_name: Library Dependency Graph (library_dependency_graph.json)
         build_variants: [enterprise-rhel-70-64-bit-kitchen-sink] # This must be the Dagger variant
 
-## compile_unittests - build unittests ##
-- name: compile_unittests
+## unittests - run unittests ##
+- name: unittests
   commands:
     - func: "scons compile"
       vars:
         targets: unittests
         task_compile_flags: >-
           --detect-odr-violations
-
-## unittests - run unittests ##
-- name: unittests
-  commands:
     - func: "run diskstats"
     - func: "monitor process threads"
     - func: "collect system resource info"
@@ -3453,8 +3434,8 @@ tasks:
       vars:
         resmoke_args: --suites=unittests
 
-## compile_dbtest ##
-- name: compile_dbtest
+## dbtest ##
+- name: dbtest
   commands:
     - func: "scons compile"
       vars:
@@ -3469,10 +3450,6 @@ tasks:
         source_dir: "src"
         include:
           - "./dbtest*"
-
- ## dbtest ##
-- name: dbtest
-  commands:
     - func: "run diskstats"
     - func: "monitor process threads"
     - func: "collect system resource info"
@@ -7069,15 +7046,12 @@ task_groups:
 - <<: *compile_task_group_template
   name: dbtest_TG
   tasks:
-  - compile_dbtest
   - dbtest
 - <<: *compile_task_group_template
   name: compile_all_run_unittests_TG
   tasks:
   - compile
-  - compile_unittests
   - unittests
-  - compile_dbtest
   - dbtest
   - compile_all
 - name: embedded_sdk_build_and_test
@@ -7145,9 +7119,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7254,9 +7225,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7314,9 +7282,6 @@ buildvariants:
     tooltags: ""
     build_mongoreplay: true
     target_resmoke_time: 15
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -7427,9 +7392,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7484,9 +7446,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7574,9 +7533,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7634,9 +7590,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7769,9 +7722,6 @@ buildvariants:
     multiversion_platform: ubuntu1604
     multiversion_architecture: arm64
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -7850,9 +7800,6 @@ buildvariants:
     multiversion_platform: ubuntu1604
     multiversion_architecture: arm64
     multiversion_edition: targeted
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: free_monitoring
@@ -7888,9 +7835,6 @@ buildvariants:
     multiversion_architecture: ppc64le
     multiversion_edition: enterprise
     use_default_timeouts: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -7974,9 +7918,6 @@ buildvariants:
     multiversion_platform: ubuntu1604
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8084,9 +8025,6 @@ buildvariants:
     multiversion_platform: ubuntu1804
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8192,9 +8130,6 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: true
     virtualenv: /opt/mongodbtoolchain/v2/bin/virtualenv
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8269,9 +8204,6 @@ buildvariants:
     tooltags: "ssl"
     build_mongoreplay: true
     virtualenv: /opt/mongodbtoolchain/v2/bin/virtualenv
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8367,9 +8299,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8447,9 +8376,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8541,9 +8467,6 @@ buildvariants:
     tooltags: ""
     build_mongoreplay: false
     large_distro_name: windows-64-vs2015-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8698,8 +8621,6 @@ buildvariants:
     jstestfuzz_num_generated_files: 35
     target_resmoke_time: 20
     large_distro_name: windows-64-vs2017-compile
-  display_tasks:
-  - *dbtest
   tasks:
   - name: compile_TG
     requires:
@@ -8752,9 +8673,6 @@ buildvariants:
 - <<: *enterprise-windows-64-2k8-nopush-template
   name: enterprise-windows-64-2k8-compile-all
   display_name: "* Enterprise Windows 2008R2 compile_all"
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8825,9 +8743,6 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: false
     large_distro_name: windows-64-vs2015-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8891,9 +8806,6 @@ buildvariants:
     tooltags: "ssl"
     build_mongoreplay: false
     large_distro_name: windows-64-vs2015-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9033,9 +8945,6 @@ buildvariants:
     tooltags: "ssl"
     resmoke_jobs_max: 1
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -9139,9 +9048,6 @@ buildvariants:
     compile_flags: --dbg=on --opt=on -j$(sysctl -n hw.logicalcpu) --libc++ CCFLAGS="-mmacosx-version-min=10.11" LINKFLAGS="-mmacosx-version-min=10.11"
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -9175,9 +9081,6 @@ buildvariants:
     tooltags: "ssl sasl"
     resmoke_jobs_max: 1
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: audit
@@ -9226,9 +9129,6 @@ buildvariants:
     build_openssl: true
     openssl_config_flags: "-mmacosx-version-min=10.11"
     openssl_make_flags: "-j$(sysctl -n hw.logicalcpu)"
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: audit
@@ -9709,9 +9609,6 @@ buildvariants:
     jstestfuzz_concurrent_num_files: 10
     target_resmoke_time: 10
     large_distro_name: rhel62-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9918,9 +9815,6 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: true
     large_distro_name: rhel62-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10076,9 +9970,6 @@ buildvariants:
     use_scons_cache: false
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: rollback_fuzzer_gen
@@ -10212,9 +10103,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10318,9 +10206,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10420,9 +10305,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10527,9 +10409,6 @@ buildvariants:
     multiversion_platform: rhel71
     multiversion_architecture: ppc64le
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10638,9 +10517,6 @@ buildvariants:
     multiversion_platform: rhel72
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10745,9 +10621,6 @@ buildvariants:
     repo_edition: enterprise
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10852,9 +10725,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10943,9 +10813,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11000,9 +10867,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11072,9 +10936,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11092,9 +10953,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11127,9 +10985,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11187,9 +11042,6 @@ buildvariants:
     multiversion_platform: suse12
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11294,9 +11146,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11387,9 +11236,6 @@ buildvariants:
     scons_cache: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11443,9 +11289,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11538,9 +11381,6 @@ buildvariants:
     tooltags: "ssl sasl"
     scons_cache_scope: shared
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11597,9 +11437,6 @@ buildvariants:
     tooltags: "ssl"
     scons_cache_scope: shared
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11688,9 +11525,6 @@ buildvariants:
     tooltags: "ssl sasl"
     build_mongoreplay: true
     large_distro_name: rhel62-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11835,8 +11669,6 @@ buildvariants:
     additional_targets: mongoebench mongoed
   display_tasks:
   - *benchrun_embedded
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11912,9 +11744,6 @@ buildvariants:
     resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers
     build_mongoreplay: true
     additional_targets: mongoebench mongoed
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -11990,9 +11819,6 @@ buildvariants:
     resmoke_jobs_max: 1
     build_mongoreplay: true
     additional_targets: mongoebench mongoed
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -12031,9 +11857,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12114,9 +11937,6 @@ buildvariants:
     tooltags: "ssl sasl"
     resmoke_jobs_factor: 0.25
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12197,9 +12017,6 @@ buildvariants:
     tooltags: "ssl sasl"
     resmoke_jobs_max: 2
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12305,9 +12122,6 @@ buildvariants:
     build_mongoreplay: true
     hang_analyzer_dump_core: false
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: rollback_fuzzer_gen
@@ -12453,9 +12267,6 @@ buildvariants:
     hang_analyzer_dump_core: false
     scons_cache_scope: shared
     target_resmoke_time: 15
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: free_monitoring
@@ -12497,9 +12308,6 @@ buildvariants:
     resmoke_jobs_factor: 0.3  # Avoid starting too many mongod's under UBSAN build.
     build_mongoreplay: true
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -12638,9 +12446,6 @@ buildvariants:
     build_mongoreplay: true
     hang_analyzer_dump_core: false
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: jsCore
@@ -12671,9 +12476,6 @@ buildvariants:
     hang_analyzer_dump_core: false
     test_flags: --serviceExecutor=adaptive --excludeWithAnyTags=requires_mmapv1
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -12772,9 +12574,6 @@ buildvariants:
     scons_cache_mode: all
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12820,8 +12619,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
   tasks:
   - name: compile_TG
   - name: aggregation
@@ -12936,8 +12733,6 @@ buildvariants:
     python: python
     ext: zip
     use_scons_cache: true
-  display_tasks:
-  - *dbtest
   tasks:
   - name: compile_TG
   - name: aggregation
@@ -13055,8 +12850,6 @@ buildvariants:
     resmoke_jobs_max: 1
     tooltags: "ssl sasl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
   tasks:
   - name: compile_TG
   - name: aggregation
@@ -13142,9 +12935,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: false
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros: