From 8e424563048f15a8a7f2fe6de1ad40131a75580b Mon Sep 17 00:00:00 2001 From: Andrew Morrow Date: Thu, 6 Jun 2013 12:43:53 -0400 Subject: SERVER-6514 Don't attempt to test shared library clients for out of tree builds --- buildscripts/smoke.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'buildscripts') 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] -- cgit v1.2.1