summaryrefslogtreecommitdiff
path: root/build_posix
diff options
context:
space:
mode:
authorSusan LoVerso <sue@wiredtiger.com>2015-05-04 11:07:38 -0400
committerSusan LoVerso <sue@wiredtiger.com>2015-05-04 11:07:38 -0400
commit9888eff27159a52d2990f865dabb506d07bee1e7 (patch)
tree4b8d232397f37d502553839c1fdac1605b13bb7b /build_posix
parenta7a9ced7919c61b502f7dbd1d7c6dbb3d6b459ac (diff)
parent8e9b6736a0cee2c4ebdea8f3922da07aec95744f (diff)
downloadmongo-9888eff27159a52d2990f865dabb506d07bee1e7.tar.gz
Merge branch 'develop' into encryption-api
Conflicts: src/docs/command-line.dox
Diffstat (limited to 'build_posix')
-rw-r--r--build_posix/Make.subdirs2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_posix/Make.subdirs b/build_posix/Make.subdirs
index cf58f2c8e33..33d3cbb8bc1 100644
--- a/build_posix/Make.subdirs
+++ b/build_posix/Make.subdirs
@@ -22,6 +22,8 @@ examples/c
lang/java JAVA
examples/java JAVA
lang/python PYTHON
+
+# Make the tests
test/bloom
test/checkpoint
test/fops