diff options
| author | Andrew Morrow <acm@mongodb.com> | 2019-06-19 11:36:50 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2019-06-20 14:31:23 -0400 |
| commit | e3f4aa4cf938be00e33874408185767ad256a769 (patch) | |
| tree | a6490e5fcd6912d46514b2657a1dc46a352fd943 /src/mongo/util/concurrency | |
| parent | 065a8926202af35bd19a9e2974aaa18f341604fa (diff) | |
| download | mongo-e3f4aa4cf938be00e33874408185767ad256a769.tar.gz | |
SERVER-41809 Collapse unit tests on a per-directory basis
Diffstat (limited to 'src/mongo/util/concurrency')
| -rw-r--r-- | src/mongo/util/concurrency/SConscript | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/src/mongo/util/concurrency/SConscript b/src/mongo/util/concurrency/SConscript index 05862f057aa..535635079a0 100644 --- a/src/mongo/util/concurrency/SConscript +++ b/src/mongo/util/concurrency/SConscript @@ -25,14 +25,6 @@ env.Library( ] ) -env.CppUnitTest( - target='thread_pool_test', - source=['thread_pool_test.cpp'], - LIBDEPS=[ - 'thread_pool', - 'thread_pool_test_fixture', - ]) - env.Library('ticketholder', ['ticketholder.cpp'], LIBDEPS=[ @@ -41,15 +33,6 @@ env.Library('ticketholder', '$BUILD_DIR/third_party/shim_boost', ]) - -env.CppUnitTest( - target='ticketholder_test', - source=['ticketholder_test.cpp'], - LIBDEPS=[ - 'ticketholder', - '$BUILD_DIR/mongo/unittest/unittest', - ]) - env.Library( target='spin_lock', source=[ @@ -58,18 +41,17 @@ env.Library( ) env.CppUnitTest( - target='spin_lock_test', + target='util_concurrency_test', source=[ 'spin_lock_test.cpp', + 'thread_pool_test.cpp', + 'ticketholder_test.cpp', + 'with_lock_test.cpp', ], LIBDEPS=[ 'spin_lock', - '$BUILD_DIR/third_party/shim_boost', - ], + 'thread_pool', + 'thread_pool_test_fixture', + 'ticketholder', + ] ) - -env.CppUnitTest( - target='with_lock_test', - source=[ - 'with_lock_test.cpp', - ]) |