summaryrefslogtreecommitdiff
path: root/src/mongo/db/SConscript
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2016-04-14 09:58:12 -0400
committerAndy Schwerin <schwerin@mongodb.com>2016-05-23 10:27:00 -0400
commitc9aac9d6eaba6ef2eb8903f07e997b594e88addc (patch)
treeb8222b86f1de0a352048dd269f547fe31f4dc13c /src/mongo/db/SConscript
parentfb052c13742deab981c7ba729dad36e33bdd7393 (diff)
downloadmongo-c9aac9d6eaba6ef2eb8903f07e997b594e88addc.tar.gz
SERVER-18277 Track operation deadlines in OperationContext, not CurOp.
This also unifies the implementations of checkForInterrupt and checkForInterruptNoAssert.
Diffstat (limited to 'src/mongo/db/SConscript')
-rw-r--r--src/mongo/db/SConscript9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 44acf010272..752b6c683fc 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -162,15 +162,15 @@ env.Library(
)
env.CppUnitTest(
- target='curop_test',
+ target='operation_context_test',
source=[
- 'curop_test.cpp',
+ 'operation_context_test.cpp',
],
LIBDEPS=[
- 'commands_test_crutch',
- 'curop',
+ 'service_context',
'$BUILD_DIR/mongo/db/auth/authorization_manager_mock_init',
'$BUILD_DIR/mongo/db/service_context_noop_init',
+ '$BUILD_DIR/mongo/util/clock_source_mock',
],
)
@@ -468,6 +468,7 @@ env.Library(
'$BUILD_DIR/mongo/util/clock_sources',
'$BUILD_DIR/mongo/util/concurrency/spin_lock',
'$BUILD_DIR/mongo/util/decorable',
+ '$BUILD_DIR/mongo/util/fail_point',
'$BUILD_DIR/mongo/util/net/hostandport',
],
)