diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-12-20 10:27:28 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-12-20 10:27:28 +1100 |
| commit | fa69e2a994a7c351c6d81cd96a271c5abaf04780 (patch) | |
| tree | 21e7b7dd739ab7db068475d457335fef40a95194 /test/suite/run.py | |
| parent | e2fcf1a851c7a9d966cf4e8609fdd6cbbbcf16a6 (diff) | |
| download | mongo-fa69e2a994a7c351c6d81cd96a271c5abaf04780.tar.gz | |
Update test/3rdparty with the packages required to run the test suite in parallel mode. Change the short command line flag to "-j", matching make.
--HG--
rename : test/3rdparty/testscenarios-0.2/.bzrignore => test/3rdparty/testscenarios-0.4/.bzrignore
rename : test/3rdparty/testscenarios-0.2/Apache-2.0 => test/3rdparty/testscenarios-0.4/Apache-2.0
rename : test/3rdparty/testscenarios-0.2/BSD => test/3rdparty/testscenarios-0.4/BSD
rename : test/3rdparty/testscenarios-0.2/COPYING => test/3rdparty/testscenarios-0.4/COPYING
rename : test/3rdparty/testscenarios-0.2/GOALS => test/3rdparty/testscenarios-0.4/GOALS
rename : test/3rdparty/testscenarios-0.2/HACKING => test/3rdparty/testscenarios-0.4/HACKING
rename : test/3rdparty/testscenarios-0.2/MANIFEST.in => test/3rdparty/testscenarios-0.4/MANIFEST.in
rename : test/3rdparty/testscenarios-0.2/Makefile => test/3rdparty/testscenarios-0.4/Makefile
rename : test/3rdparty/testscenarios-0.2/doc/__init__.py => test/3rdparty/testscenarios-0.4/doc/__init__.py
rename : test/3rdparty/testscenarios-0.2/doc/example.py => test/3rdparty/testscenarios-0.4/doc/example.py
rename : test/3rdparty/testscenarios-0.2/doc/test_sample.py => test/3rdparty/testscenarios-0.4/doc/test_sample.py
rename : test/3rdparty/testtools-0.9.12/doc/conf.py => test/3rdparty/testtools-0.9.34/doc/conf.py
rename : test/3rdparty/testtools-0.9.12/doc/make.bat => test/3rdparty/testtools-0.9.34/doc/make.bat
rename : test/3rdparty/testtools-0.9.12/testtools/_compat2x.py => test/3rdparty/testtools-0.9.34/testtools/_compat2x.py
rename : test/3rdparty/testtools-0.9.12/testtools/_spinner.py => test/3rdparty/testtools-0.9.34/testtools/_spinner.py
rename : test/3rdparty/testtools-0.9.12/testtools/distutilscmd.py => test/3rdparty/testtools-0.9.34/testtools/distutilscmd.py
rename : test/3rdparty/testtools-0.9.12/testtools/monkey.py => test/3rdparty/testtools-0.9.34/testtools/monkey.py
rename : test/3rdparty/testtools-0.9.12/testtools/tests/test_monkey.py => test/3rdparty/testtools-0.9.34/testtools/tests/test_monkey.py
rename : test/3rdparty/testtools-0.9.12/testtools/tests/test_runtest.py => test/3rdparty/testtools-0.9.34/testtools/tests/test_runtest.py
rename : test/3rdparty/testtools-0.9.12/testtools/utils.py => test/3rdparty/testtools-0.9.34/testtools/utils.py
Diffstat (limited to 'test/suite/run.py')
| -rw-r--r-- | test/suite/run.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/suite/run.py b/test/suite/run.py index 933e272841f..bd808a0544e 100644 --- a/test/suite/run.py +++ b/test/suite/run.py @@ -40,9 +40,13 @@ wt_3rdpartydir = os.path.join(wt_disttop, 'test', '3rdparty') # Cannot import wiredtiger and supporting utils until we set up paths sys.path.append(os.path.join(wt_builddir, 'lang', 'python')) sys.path.append(os.path.join(wt_disttop, 'lang', 'python')) -sys.path.append(os.path.join(wt_3rdpartydir, 'discover-0.4.0')) -sys.path.append(os.path.join(wt_3rdpartydir, 'testtools-0.9.12')) -sys.path.append(os.path.join(wt_3rdpartydir, 'testscenarios-0.2', 'lib')) + +# Add all 3rd party directories: some have code in subdirectories +for d in os.listdir(wt_3rdpartydir): + for subdir in ('lib', 'python', ''): + if os.path.exists(os.path.join(wt_3rdpartydir, d, subdir)): + sys.path.append(os.path.join(wt_3rdpartydir, d, subdir)) + break import wttest # Use the same version of unittest found by wttest.py @@ -62,8 +66,8 @@ Options:\n\ -d | --debug run with \'pdb\', the python debugger\n\ -g | --gdb all subprocesses (like calls to wt) use gdb\n\ -h | --help show this message\n\ + -j N | --parallel N run all tests in parallel using N processes\n\ -p | --preserve preserve output files in WT_TEST/<testname>\n\ - -P N | --parallel N run all tests in parallel using N processes\n\ -t | --timestamp name WT_TEST according to timestamp\n\ -v N | --verbose N set verboseness to N (0<=N<=3, default=1)\n\ \n\ @@ -224,7 +228,7 @@ if __name__ == '__main__': if option == '-debug' or option == 'd': debug = True continue - if option == '-parallel' or option == 'P': + if option == '-parallel' or option == 'j': if parallel != 0 or len(args) == 0: usage() sys.exit(False) |