diff options
| author | Michael Felt <aixtools@users.noreply.github.com> | 2018-12-26 05:45:19 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2018-12-26 05:45:19 (GMT) |
| commit | 259c159fc1faab0dd631d20374842dc0d6a9f145 (patch) | |
| tree | d12e0131a3e7e96f1d0169f7f8e0dee7b280ea48 | |
| parent | 2062a20641febad5eb9c18d74e1cfb4d7a6e53ed (diff) | |
| download | cpython-259c159fc1faab0dd631d20374842dc0d6a9f145.zip cpython-259c159fc1faab0dd631d20374842dc0d6a9f145.tar.gz cpython-259c159fc1faab0dd631d20374842dc0d6a9f145.tar.bz2 | |
bpo-34897: avoid distutils test error when CXX is not set (GH-9706)
Depending on system config, a missing candidate compiler name may be
reported as the empty string rather than as None, so adjust the test
helper accordingly.
| -rw-r--r-- | Lib/test/support/__init__.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-10-04-20-25-35.bpo-34897.rNE2Cy.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 53119e1..dd1790d 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -2783,7 +2783,7 @@ def missing_compiler_executable(cmd_names=[]): if cmd_names: assert cmd is not None, \ "the '%s' executable is not configured" % name - elif cmd is None: + elif not cmd: continue if spawn.find_executable(cmd[0]) is None: return cmd[0] diff --git a/Misc/NEWS.d/next/Library/2018-10-04-20-25-35.bpo-34897.rNE2Cy.rst b/Misc/NEWS.d/next/Library/2018-10-04-20-25-35.bpo-34897.rNE2Cy.rst new file mode 100644 index 0000000..f253496 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-10-04-20-25-35.bpo-34897.rNE2Cy.rst @@ -0,0 +1,2 @@ +Adjust test.support.missing_compiler_executable check so that a nominal +command name of "" is ignored. Patch by Michael Felt. |