Imported Upstream version 2.4.5upstream/2.4.5

2 files changed, 14 insertions, 3 deletions

diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py
index ef5e1a88877..e49073cadce 100755
--- a/buildscripts/errorcodes.py
+++ b/buildscripts/errorcodes.py
@@ -40,7 +40,7 @@ def readErrorCodes( callback, replaceZero = False ):
            re.compile( "((fassertFailed)()) *\(( *)(\d+)" )
            ]
 
-    bad = [ re.compile( "\sassert *\(" ) ]
+    bad = [ re.compile( "^\s*assert *\(" ) ]
     
     for x in utils.getAllSourceFiles():
         
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 55b48d5d08a..b70d5e109a9 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -447,11 +447,14 @@ def runTest(test):
     else:
         keyFileData = None
 
+    mongo_test_filename = os.path.basename(path)
+    if 'sharedclient' in path:
+        mongo_test_filename += "-sharedclient"
 
     # sys.stdout.write() is more atomic than print, so using it prevents
     # lines being interrupted by, e.g., child processes
     sys.stdout.write(" *******************************************\n")
-    sys.stdout.write("         Test : %s ...\n" % os.path.basename(path))
+    sys.stdout.write("         Test : %s ...\n" % mongo_test_filename)
     sys.stdout.flush()
 
     # FIXME: we don't handle the case where the subprocess
@@ -485,7 +488,7 @@ def runTest(test):
     sys.stdout.write("         Date : %s\n" % datetime.now().ctime())
     sys.stdout.flush()
 
-    os.environ['MONGO_TEST_FILENAME'] = os.path.basename(path)
+    os.environ['MONGO_TEST_FILENAME'] = mongo_test_filename
     t1 = time.time()
     r = call(buildlogger(argv), cwd=test_path)
     t2 = time.time()
@@ -690,6 +693,14 @@ def expand_suites(suites,expandUseDB=True):
             paths = ["firstExample", "secondExample", "whereExample", "authTest", "clientTest", "httpClientTest"]
             if os.sys.platform == "win32":
                 paths = [path + '.exe' for path in paths]
+
+            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]
         elif suite == 'mongosTest':