summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@10gen.com>2013-06-17 16:36:22 -0400
committerAndrew Morrow <acm@10gen.com>2013-06-18 09:51:06 -0400
commitefe5ff8332c3c89e4d3bc9f3e180356aacd2d6f7 (patch)
tree279c10aec2d3ab3b664202b12373970879929ab9
parentdaf69857a3b82d7ba6f9362ee01cd8982e5f5e23 (diff)
downloadmongo-efe5ff8332c3c89e4d3bc9f3e180356aacd2d6f7.tar.gz
SERVER-9942 Give shared client tests a unique name to placate buildlogger
(cherry picked from commit af07d274c2dc0806966b2ffc991eb120ca232da1)
-rwxr-xr-xbuildscripts/smoke.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 2d36762ee3a..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()