SERVER-41809 Collapse unit tests on a per-directory basis

1 files changed, 27 insertions, 84 deletions

diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript
index 7c015cb39f3..ea00837604e 100644
--- a/src/mongo/executor/SConscript
+++ b/src/mongo/executor/SConscript
@@ -95,30 +95,6 @@ env.Library(
     ],
 )
 
-env.CppUnitTest(
-    target='connection_pool_test',
-    source=[
-        'connection_pool_test.cpp',
-        'connection_pool_test_fixture.cpp',
-    ],
-    LIBDEPS=[
-        'connection_pool_executor',
-    ],
-    LIBDEPS_PRIVATE=[
-        'egress_tag_closer_manager',
-    ],
-)
-
-env.CppUnitTest(
-    target='network_interface_mock_test',
-    source=[
-        'network_interface_mock_test.cpp'
-    ],
-    LIBDEPS=[
-        'network_interface_mock',
-    ],
-)
-
 env.Library(target='network_test_env',
             source=['network_test_env.cpp',],
             LIBDEPS=[
@@ -170,19 +146,6 @@ env.Library(
     ]
 )
 
-env.CppIntegrationTest(
-    target='network_interface_integration_test',
-    source=[
-        'network_interface_integration_test.cpp',
-    ],
-    LIBDEPS=[
-        'network_interface_fixture',
-        '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
-        '$BUILD_DIR/mongo/db/wire_version',
-        '$BUILD_DIR/mongo/transport/transport_layer_egress_init',
-    ],
-)
-
 env.Library(
     target='network_interface_factory',
     source=[
@@ -247,16 +210,6 @@ env.Library(
     ]
 )
 
-env.CppUnitTest(
-    target='thread_pool_task_executor_test',
-    source=[
-        'thread_pool_task_executor_test.cpp',
-    ],
-    LIBDEPS=[
-        'thread_pool_task_executor_test_fixture',
-    ]
-)
-
 env.Library(
     target='task_executor_pool',
     source=[
@@ -281,70 +234,60 @@ env.Library(
     ],
 )
 
-env.CppIntegrationTest(
-    target='task_executor_cursor_integration_test',
+env.Library(
+    target='non_auth_task_executor',
     source=[
-        'task_executor_cursor_integration_test.cpp',
+        'non_auth_task_executor.cpp',
     ],
     LIBDEPS=[
-        'task_executor_cursor',
-        '$BUILD_DIR/mongo/client/clientdriver_network',
-        '$BUILD_DIR/mongo/db/wire_version',
+        'task_executor_interface',
         '$BUILD_DIR/mongo/executor/network_interface_factory',
         '$BUILD_DIR/mongo/executor/network_interface_thread_pool',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
-        '$BUILD_DIR/mongo/transport/transport_layer_egress_init',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
-        '$BUILD_DIR/mongo/util/version_impl',
     ],
 )
 
 env.CppUnitTest(
-    target='task_executor_cursor_test',
+    target='executor_test',
     source=[
+        'connection_pool_test.cpp',
+        'connection_pool_test_fixture.cpp',
+        'network_interface_mock_test.cpp',
+        'scoped_task_executor_test.cpp',
         'task_executor_cursor_test.cpp',
+        'thread_pool_task_executor_test.cpp',
     ],
     LIBDEPS=[
+        'connection_pool_executor',
+        'egress_tag_closer_manager',
+        'network_interface_mock',
+        'scoped_task_executor',
         'task_executor_cursor',
+        'thread_pool_task_executor',
         'thread_pool_task_executor_test_fixture',
     ],
 )
 
-env.Library(
-    target='non_auth_task_executor',
-    source=[
-        'non_auth_task_executor.cpp',
-    ],
-    LIBDEPS=[
-        'task_executor_interface',
-        '$BUILD_DIR/mongo/executor/network_interface_factory',
-        '$BUILD_DIR/mongo/executor/network_interface_thread_pool',
-        '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
-        '$BUILD_DIR/mongo/util/concurrency/thread_pool',
-    ],
-)
-
 env.CppIntegrationTest(
-    target='non_auth_task_executor_integration_test',
+    target='executor_integration_test',
     source=[
+        'network_interface_integration_test.cpp',
+        'task_executor_cursor_integration_test.cpp',
         'non_auth_task_executor_integration_test.cpp',
     ],
     LIBDEPS=[
-        'non_auth_task_executor',
+        '$BUILD_DIR/mongo/client/clientdriver_network',
+        '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
         '$BUILD_DIR/mongo/db/wire_version',
+        '$BUILD_DIR/mongo/executor/network_interface_factory',
+        '$BUILD_DIR/mongo/executor/network_interface_thread_pool',
+        '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
         '$BUILD_DIR/mongo/transport/transport_layer_egress_init',
+        '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         '$BUILD_DIR/mongo/util/version_impl',
-    ],
-)
-
-env.CppUnitTest(
-    target='scoped_task_executor_test',
-    source=[
-        'scoped_task_executor_test.cpp',
-    ],
-    LIBDEPS=[
-        'scoped_task_executor',
-        'network_interface_mock',
-        'thread_pool_task_executor',
+        'network_interface_fixture',
+        'non_auth_task_executor',
+        'task_executor_cursor',
     ],
 )