merge from 3.2

6c3dd7ea · Senthil Kumaran · 0e0772d8 · 9bbcb254 · 6c3dd7ea
Commit 6c3dd7ea authored Jan 14, 2012 by Senthil Kumaran
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/test/regrtest.py Lib/test/regrtest.py +1 -1

No files found.
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -298,7 +298,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,

    support.record_original_stdout(sys.stdout)
    try:
-        opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:Gm:',
+        opts, args = getopt.getopt(sys.argv[1:], 'hvqxsoSrf:lu:t:TD:NLR:FwWM:nj:Gm:',
            ['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
             'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
             'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',