Issue #15324: Fix regrtest parsing of --fromfile and --randomize options.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index f01dcef308a7cfe5cb93d8221ff91c6c05eb8c3f..dd47cc36e015a6cc68b69d033e5adbf7110e5e63 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -32,7 +32,7 @@ Verbosity
 
 Selecting tests
 
--r/--random     -- randomize test execution order (see below)
+-r/--randomize  -- randomize test execution order (see below)
    --randseed   -- pass a random seed to reproduce a previous random run
 -f/--fromfile   -- read names of tests to run from a file (see below)
 -x/--exclude    -- arguments are tests to *exclude*
@@ -258,7 +258,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:j:',
             ['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
-             'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
+             'exclude', 'single', 'slow', 'randomize', 'fromfile=', 'findleaks',
              'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',
              'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=',
              'multiprocess=', 'slaveargs=', 'forever', 'header'])

diff --git a/Misc/NEWS b/Misc/NEWS
index 6c0e000f59cc4eff6b47a2cd7b41cdc4ff6f5b18..38413bd928ce915249b4382a2e6d305d7d0c13ab 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -585,6 +585,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #15324: Fix regrtest parsing of --fromfile and --randomize options.
+
 - Issue #16618: Add more regression tests for glob.
   Patch by Serhiy Storchaka.