run_tests.py: add --current option

vstinner · vstinner · commit 1f872ba7a02e · 2020-12-03T13:20:59.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,4 +12,4 @@ jobs:
 
 script:
     - python -VV
-    - python runtests.py -v
+    - python runtests.py --current --verbose
diff --git a/README.rst b/README.rst
@@ -210,13 +210,18 @@ Python 3.9
 Run tests
 =========
 
-Run the command::
+Run tests::
 
     python3 runtests.py
 
-Verbose mode::
+Only test the current Python version, don't test multiple Python versions
+(``-c``, ``--current``)::
 
-    python3 runtests.py -v
+    python3 runtests.py --current
+
+Verbose mode (``-v``, ``--verbose``)::
+
+    python3 runtests.py --verbose
 
 See tests in the ``tests/`` subdirectory.
 
diff --git a/runtests.py b/runtests.py
@@ -7,10 +7,11 @@
     python3 test_matrix.py
     python3 test_matrix.py -v # verbose mode
 """
+import argparse
 import os.path
+import shutil
 import subprocess
 import sys
-import shutil
 
 
 TEST_DIR = os.path.join(os.path.dirname(__file__), 'tests')
@@ -56,21 +57,35 @@ def run_tests(python, verbose, tested):
     run_tests_exe(executable, verbose, tested)
 
 
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-v', '--verbose', action="store_true",
+                        help='Verbose mode')
+    parser.add_argument('-c', '--current', action="store_true",
+                        help="Only test the current Python executable "
+                             "(don't test multiple Python versions)")
+    return parser.parse_args()
+
+
 def main():
-    verbose = "-v" in sys.argv[1:]
+    args = parse_args()
 
     cmd = [sys.executable, TEST_UPGRADE]
-    if verbose:
+    if args.verbose:
         cmd.append('-v')
     run_command(cmd)
+    print()
 
     tested = set()
-    for python in PYTHONS:
-        run_tests(python, verbose, tested)
-    run_tests_exe(sys.executable, verbose, tested)
-
-    print()
-    print(f"Tested: {len(tested)} Python executables")
+    if not args.current:
+        for python in PYTHONS:
+            run_tests(python, args.verbose, tested)
+        run_tests_exe(sys.executable, args.verbose, tested)
+
+        print()
+        print(f"Tested: {len(tested)} Python executables")
+    else:
+        run_tests_exe(sys.executable, args.verbose, tested)
 
 
 if __name__ == "__main__":
diff --git a/tests/test_pythoncapi_compat_cext.c b/tests/test_pythoncapi_compat_cext.c
@@ -87,12 +87,12 @@ test_frame(PyObject *self, PyObject *ignored)
     // test _PyFrame_GetBackBorrow()
     if (back != NULL) {
         Py_ssize_t back_refcnt = Py_REFCNT(back);
-        PyCodeObject *back2 = _PyFrame_GetBackBorrow(frame);
+        PyFrameObject *back2 = _PyFrame_GetBackBorrow(frame);
         assert(back2 == back);
         assert(Py_REFCNT(back) == back_refcnt);
     }
     else {
-        PyCodeObject *back2 = _PyFrame_GetBackBorrow(frame);
+        PyFrameObject *back2 = _PyFrame_GetBackBorrow(frame);
         assert(back2 == back);
     }
     Py_XDECREF(back);
