summaryrefslogtreecommitdiff
path: root/buildscripts/smoke.py
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2014-11-04 11:02:07 -0500
committerAndy Schwerin <schwerin@mongodb.com>2014-11-04 20:32:14 -0500
commit852dc8839cebeb425fb668d2e043f23d7de67e54 (patch)
treef268f1ebbfd518eb5243ae1f186bd6fa10285c58 /buildscripts/smoke.py
parent5266e7f0f23b8cf305280719d3d0e34df800b9f5 (diff)
downloadmongo-852dc8839cebeb425fb668d2e043f23d7de67e54.tar.gz
SERVER-15882 Delete dbtests/perf/perftest, which doesn't actually work.
Diffstat (limited to 'buildscripts/smoke.py')
-rwxr-xr-xbuildscripts/smoke.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index ef9ec3d5bed..703a238afae 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -8,9 +8,9 @@
# so the smoke.py process and all its children must be run with the
# mongo repo as current working directory. That's kinda icky.
-# 1 The tests that are implemented as standalone executables ("test",
-# "perftest"), don't take arguments for the dbpath, but
-# unconditionally use "/tmp/unittest".
+# 1 The tests that are implemented as standalone executables ("test"),
+# don't take arguments for the dbpath, but unconditionally use
+# "/tmp/unittest".
# 2 mongod output gets intermingled with mongo output, and it's often
# hard to find error messages in the slop. Maybe have smoke.py do
@@ -523,9 +523,9 @@ def runTest(test, result):
argv += [path]
elif ext in ["", ".exe"]:
# Blech.
- if os.path.basename(path) in ["dbtest", "dbtest.exe", "perftest", "perftest.exe"]:
+ if os.path.basename(path) in ["dbtest", "dbtest.exe"]:
argv = [path]
- # default data directory for test and perftest is /tmp/unittest
+ # default data directory for dbtest is /tmp/unittest
if smoke_db_prefix:
dir_name = smoke_db_prefix + '/unittests'
argv.extend(["--dbpath", dir_name] )
@@ -949,7 +949,6 @@ def expand_suites(suites,expandUseDB=True):
for suite in suites:
if suite == 'all':
return expand_suites(['dbtest',
- 'perf',
'jsCore',
'jsPerf',
'mmap_v1',
@@ -970,12 +969,6 @@ def expand_suites(suites,expandUseDB=True):
else:
program = 'dbtest'
(globstr, usedb) = (program, False)
- elif suite == 'perf':
- if os.sys.platform == "win32":
- program = 'perftest.exe'
- else:
- program = 'perftest'
- (globstr, usedb) = (program, False)
elif suite == 'mongosTest':
if os.sys.platform == "win32":
program = 'mongos.exe'