SERVER-7175 Support for catching conflicting mods in the update driver.

1 files changed, 35 insertions, 6 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 6baa3da84d6..9343d53f0cb 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -3,15 +3,44 @@
 Import("env")
 
 #
-# We'd like 'common' to have the abstractions that are shared by several components of the
+# The db/'common' lib has the abstractions that are shared by components of the
 # server. Ideally, many of the object in 'coredb' should be moved here when their dependencies
 # get resolved.
 #
 
-env.StaticLibrary('common', ['field_ref.cpp', 'field_parser.cpp'],
-                  LIBDEPS=['$BUILD_DIR/mongo/bson',
-                           '$BUILD_DIR/mongo/foundation'])
+env.StaticLibrary(
+    target= 'common',
+    source= [
+        'field_ref.cpp',
+        'field_ref_set.cpp',
+        'field_parser.cpp',
+    ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/bson',
+        '$BUILD_DIR/mongo/foundation',
+    ],
+)
 
-env.CppUnitTest('field_ref_test', ['field_ref_test.cpp'], LIBDEPS=['common'])
+env.CppUnitTest(
+    target= 'field_ref_test',
+    source= 'field_ref_test.cpp',
+    LIBDEPS=[
+        'common',
+    ],
+)
 
-env.CppUnitTest('field_parser_test', ['field_parser_test.cpp'], LIBDEPS=['common'])
+env.CppUnitTest(
+    target= 'field_ref_set_test',
+    source = 'field_ref_set_test.cpp',
+    LIBDEPS=[
+        'common',
+    ],
+)
+
+env.CppUnitTest(
+    target= 'field_parser_test',
+    source= 'field_parser_test.cpp',
+    LIBDEPS=[
+        'common',
+   ],
+)