summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorAndrew Morrow <acm@10gen.com>2013-06-06 12:43:53 -0400
committerAndrew Morrow <acm@10gen.com>2013-06-06 13:39:50 -0400
commit8e424563048f15a8a7f2fe6de1ad40131a75580b (patch)
tree3c364a3ea8c322c2dd1edcfc97d73096ba9c647b /buildscripts
parentce97dc76c6a3f399f2f67613a55a7c238384ede9 (diff)
downloadmongo-8e424563048f15a8a7f2fe6de1ad40131a75580b.tar.gz
SERVER-6514 Don't attempt to test shared library clients for out of tree builds
Diffstat (limited to 'buildscripts')
-rwxr-xr-xbuildscripts/smoke.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index f0a8f0d431e..85fbceea407 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -693,10 +693,12 @@ def expand_suites(suites,expandUseDB=True):
if os.sys.platform == "win32":
paths = [path + '.exe' for path in paths]
- # Add any files of the same name from the sharedclient directory.
- scpaths = ["sharedclient/" + path for path in paths]
- scfiles = glob.glob("sharedclient/*")
- paths += [scfile for scfile in scfiles if scfile in scpaths]
+ if not test_path:
+ # If we are testing 'in-tree', then add any files of the same name from the
+ # sharedclient directory. The out of tree client build doesn't have shared clients.
+ scpaths = ["sharedclient/" + path for path in paths]
+ scfiles = glob.glob("sharedclient/*")
+ paths += [scfile for scfile in scfiles if scfile in scpaths]
# hack
tests += [(test_path and path or os.path.join(mongo_repo, path), False) for path in paths]