Merge from 3.3: Issue #15324: Fix regrtest --fromfile, --match, --randomize.

diff --cc Lib/test/regrtest.py
Simple merge

diff --cc Misc/NEWS
index de9a4317c3911e3786a081caa9299e3529eeb2a1,521f749f83f2e6505089cdde23555c0e89df083a..d35575087926352bfbd86b26e8189b350ea06186
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -531,9 -348,9 +531,12 @@@ Extension Module
  Tests
  -----
  
 +- Issue #10646: Tests rearranged for os.samefile/samestat to check for not
 +  just symlinks but also hard links.
 +
+ - Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize
+   options.
+ 
  - Issue #16664: Add regression tests for glob's behaviour concerning entries
    starting with a ".".  Patch by Sebastian Kreft.