Merge pull request #2 from python/master

Sync Fork from Upstream Repo

Author: sthagen

.travis.yml

@@ -17,20 +17,28 @@ dist: xenial
 
 env:
   TOXENV=py
-  EXTRA_ARGS="-n 12"
+  EXTRA_ARGS="-n 2"
   TEST_MYPYC=0
   PYTHON_DEBUG_BUILD=0
 
 jobs:
   include:
   # Specifically request 3.5.1 because we need to be compatible with that.
-  - name: "run test suite with python 3.5.1"
+  - name: "run test suite with python 3.5.1 (compiled with mypyc)"
     python: 3.5.1
     dist: trusty
+    env:
+    - TOXENV=py
+    - EXTRA_ARGS="-n 2"
+    - TEST_MYPYC=1
   - name: "run test suite with python 3.6"
     python: 3.6    # 3.6.3  pip  9.0.1
-  - name: "run test suite with python 3.7"
-    python: 3.7    # 3.7.0  pip 10.0.1
+  - name: "run test suite with python 3.7 (compiled with mypyc)"
+    python: 3.7
+    env:
+    - TOXENV=py
+    - EXTRA_ARGS="-n 2"
+    - TEST_MYPYC=1
   - name: "run test suite with python 3.8"
     python: 3.8
   - name: "run mypyc runtime tests with python 3.6 debug build"
@@ -39,20 +47,14 @@ jobs:
       - TOXENV=py36
       - PYTHONVERSION=3.6.8
       - PYTHON_DEBUG_BUILD=1
-      - EXTRA_ARGS="-n 12 mypyc/test/test_run.py mypyc/test/test_external.py"
+      - EXTRA_ARGS="-n 2 mypyc/test/test_run.py mypyc/test/test_external.py"
   - name: "run mypyc runtime tests with python 3.6 on OS X"
     os: osx
     osx_image: xcode8.3
     language: generic
     env:
       - PYTHONVERSION=3.6.3
-      - EXTRA_ARGS="-n 12 mypyc/test/test_run.py mypyc/test/test_external.py"
-  - name: "run test suite with python 3.7 (compiled with mypyc)"
-    python: 3.7
-    env:
-    - TOXENV=py
-    - EXTRA_ARGS="-n 12"
-    - TEST_MYPYC=1
+      - EXTRA_ARGS="-n 2 mypyc/test/test_run.py mypyc/test/test_external.py"
   - name: "type check our own code"
     python: 3.7
     env:

runtests.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
+import subprocess
+from subprocess import Popen
 from os import system
 from sys import argv, exit, platform, executable, version_info
 
-prog, *args = argv
-
 
 # Use the Python provided to execute the script, or fall back to a sane default
 if version_info >= (3, 5, 0):
@@ -25,6 +25,9 @@
 STUBGEN_PY = 'StubgenPythonSuite'
 MYPYC_RUN = 'TestRun'
 MYPYC_RUN_MULTI = 'TestRunMultiFile'
+MYPYC_EXTERNAL = 'TestExternal'
+MYPYC_COMMAND_LINE = 'TestCommandLine'
+ERROR_STREAM = 'ErrorStreamSuite'
 
 
 ALL_NON_FAST = [CMDLINE,
@@ -36,7 +39,10 @@
                 STUBGEN_CMD,
                 STUBGEN_PY,
                 MYPYC_RUN,
-                MYPYC_RUN_MULTI]
+                MYPYC_RUN_MULTI,
+                MYPYC_EXTERNAL,
+                MYPYC_COMMAND_LINE,
+                ERROR_STREAM]
 
 # We split the pytest run into three parts to improve test
 # parallelization. Each run should have tests that each take a roughly similar
@@ -55,31 +61,87 @@
                                                       STUBGEN_PY]),
     # Test cases that may take seconds to run each
     'pytest-slow': 'pytest -k "%s"' % ' or '.join(
-        [SAMPLES, TYPESHED, PEP561, DAEMON, MYPYC_RUN, MYPYC_RUN_MULTI]),
+        [SAMPLES,
+         TYPESHED,
+         PEP561,
+         DAEMON,
+         MYPYC_RUN,
+         MYPYC_RUN_MULTI,
+         MYPYC_EXTERNAL,
+         MYPYC_COMMAND_LINE,
+         ERROR_STREAM]),
 }
 
 # Stop run immediately if these commands fail
 FAST_FAIL = ['self', 'lint']
 
 assert all(cmd in cmds for cmd in FAST_FAIL)
 
-if not set(args).issubset(cmds):
-    print("usage:", prog, " ".join('[%s]' % k for k in cmds))
-    exit(1)
-
-if not args:
-    args = list(cmds)
-
-status = 0
 
-for arg in args:
-    cmd = cmds[arg]
-    print('run %s: %s' % (arg, cmd))
+def run_cmd(name: str) -> int:
+    status = 0
+    cmd = cmds[name]
+    print('run %s: %s' % (name, cmd))
     res = (system(cmd) & 0x7F00) >> 8
     if res:
-        print('\nFAILED: %s' % arg)
+        print('\nFAILED: %s' % name)
         status = res
-        if arg in FAST_FAIL:
+        if name in FAST_FAIL:
             exit(status)
+    return status
+
+
+def start_background_cmd(name: str) -> Popen:
+    cmd = cmds[name]
+    proc = subprocess.Popen(cmd,
+                            shell=True,
+                            stderr=subprocess.STDOUT,
+                            stdout=subprocess.PIPE)
+    return proc
+
+
+def wait_background_cmd(name: str, proc: Popen) -> int:
+    output = proc.communicate()[0]
+    status = proc.returncode
+    print('run %s: %s' % (name, cmds[name]))
+    if status:
+        print(output.decode().rstrip())
+        print('\nFAILED: %s' % name)
+        if name in FAST_FAIL:
+            exit(status)
+    return status
+
+
+def main() -> None:
+    prog, *args = argv
+
+    if not set(args).issubset(cmds):
+        print("usage:", prog, " ".join('[%s]' % k for k in cmds))
+        exit(1)
+
+    if not args:
+        args = list(cmds)
+
+    status = 0
+
+    if 'self' in args and 'lint' in args:
+        # Perform lint and self check in parallel as it's faster.
+        proc = start_background_cmd('lint')
+        cmd_status = run_cmd('self')
+        if cmd_status:
+            status = cmd_status
+        cmd_status = wait_background_cmd('lint', proc)
+        if cmd_status:
+            status = cmd_status
+        args = [arg for arg in args if arg not in ('self', 'lint')]
+
+    for arg in args:
+        cmd_status = run_cmd(arg)
+        if cmd_status:
+            status = cmd_status
+
+    exit(status)
+
 
-exit(status)
+if __name__ == '__main__':
+    main()