summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@10gen.com>2013-06-06 12:43:53 -0400
committerAndrew Morrow <acm@10gen.com>2013-06-07 18:48:18 -0400
commit9c4382ecb90f1044e3ba0e38991cf5c45281b7ea (patch)
treec9ecfb1756473f8e9b14ff38a403bf3258110984
parent288d347dbfcd99f49f75b8d2313aa49429b9119c (diff)
downloadmongo-9c4382ecb90f1044e3ba0e38991cf5c45281b7ea.tar.gz
SERVER-6514 Don't attempt to test shared library clients for out of tree builds
(cherry picked from commit 8e424563048f15a8a7f2fe6de1ad40131a75580b)
-rwxr-xr-xbuildscripts/smoke.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 1f00aebee94..2d36762ee3a 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -691,10 +691,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]