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

1 files changed, 41 insertions, 73 deletions

diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index a3c18375696..2972ea60a2f 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -157,28 +157,6 @@ env.Library(
     ],
 )
 
-env.CppUnitTest(
-    target='chunk_split_state_driver_test',
-    source=[
-        'chunk_split_state_driver_test.cpp',
-    ],
-    LIBDEPS=[
-        'chunk_splitter',
-    ]
-)
-
-env.CppUnitTest(
-    target='config_server_op_observer_test',
-    source=[
-        'config_server_op_observer_test.cpp',
-    ],
-    LIBDEPS=[
-        'sharding_runtime_d',
-        '$BUILD_DIR/mongo/db/auth/authmocks',
-        '$BUILD_DIR/mongo/s/config_server_test_fixture',
-    ]
-)
-
 env.Library(
     target='migration_types',
     source=[
@@ -231,24 +209,6 @@ env.Library(
     ],
 )
 
-env.CppUnitTest(
-    target='balancer_test',
-    source=[
-        'balancer/balancer_policy_test.cpp',
-        'balancer/cluster_statistics_test.cpp',
-        'balancer/migration_manager_test.cpp',
-        'balancer/scoped_migration_request_test.cpp',
-        'balancer/type_migration_test.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/auth/authmocks',
-        '$BUILD_DIR/mongo/db/repl/replication_info',
-        '$BUILD_DIR/mongo/s/config_server_test_fixture',
-        '$BUILD_DIR/mongo/util/version_impl',
-        'balancer',
-    ]
-)
-
 env.Library(
     target='sharding_catalog_manager',
     source=[
@@ -346,29 +306,61 @@ env.Library(
     ],
 )
 
+env.Library(
+    target='sharding_logging',
+    source=[
+        'sharding_logging.cpp',
+    ],
+    LIBDEPS=[
+        'sharding_api_d',
+        '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl',
+    ],
+)
+
 env.CppUnitTest(
-    target='migration_types_test',
+    target='db_s_test',
     source=[
+        'chunk_split_state_driver_test.cpp',
+        'config_server_op_observer_test.cpp',
         'migration_session_id_test.cpp',
+        'sharding_logging_test.cpp',
         'start_chunk_clone_request_test.cpp',
+        'type_shard_identity_test.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/s/config_server_test_fixture',
+        '$BUILD_DIR/mongo/s/sharding_router_test_fixture',
+        'chunk_splitter',
         'migration_types',
-    ]
+        'sharding_logging',
+        'sharding_runtime_d',
+        'sharding_runtime_d',
+        'type_shard_identity',
+    ],
 )
 
 env.CppUnitTest(
-    target='type_shard_identity_test',
+    target='db_s_balancer_test',
     source=[
-        'type_shard_identity_test.cpp'
+        'balancer/balancer_policy_test.cpp',
+        'balancer/cluster_statistics_test.cpp',
+        'balancer/migration_manager_test.cpp',
+        'balancer/scoped_migration_request_test.cpp',
+        'balancer/type_migration_test.cpp',
     ],
     LIBDEPS=[
-        'type_shard_identity',
+        '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/db/repl/replication_info',
+        '$BUILD_DIR/mongo/s/config_server_test_fixture',
+        '$BUILD_DIR/mongo/util/version_impl',
+        'balancer',
     ]
 )
 
 env.CppUnitTest(
-    target='shard_server_test',
+    target='db_s_shard_server_test',
     source=[
         'active_migrations_registry_test.cpp',
         'active_move_primaries_registry_test.cpp',
@@ -401,7 +393,7 @@ env.CppUnitTest(
 )
 
 env.CppUnitTest(
-    target='collection_sharding_runtime_test',
+    target='db_s_collection_sharding_runtime_test',
     source=[
         'collection_metadata_filtering_test.cpp',
         'collection_metadata_test.cpp',
@@ -420,7 +412,7 @@ env.CppUnitTest(
 )
 
 env.CppUnitTest(
-    target='transaction_coordinator_test',
+    target='db_s_transaction_coordinator_test',
     source=[
         'transaction_coordinator_catalog_test.cpp',
         'transaction_coordinator_futures_util_test.cpp',
@@ -439,7 +431,7 @@ env.CppUnitTest(
 )
 
 env.CppUnitTest(
-    target='sharding_catalog_manager_test',
+    target='db_s_sharding_catalog_manager_test',
     source=[
         'config/initial_split_policy_test.cpp',
         'config/sharding_catalog_manager_add_shard_test.cpp',
@@ -463,27 +455,3 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/util/version_impl',
     ]
 )
-
-env.Library(
-    target='sharding_logging',
-    source=[
-        'sharding_logging.cpp',
-    ],
-    LIBDEPS=[
-        'sharding_api_d',
-        '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl',
-    ],
-)
-
-env.CppUnitTest(
-    target='sharding_logging_test',
-    source=[
-        'sharding_logging_test.cpp',
-    ],
-    LIBDEPS=[
-        'sharding_runtime_d',
-        'sharding_logging',
-        '$BUILD_DIR/mongo/db/auth/authmocks',
-        '$BUILD_DIR/mongo/s/sharding_router_test_fixture',
-    ]
-)