summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Felt <aixtools@users.noreply.github.com>2018-12-28 15:03:17 +0100
committerNick Coghlan <ncoghlan@gmail.com>2018-12-29 00:03:17 +1000
commit1db80e46af67c5aa0ffebe3fc61dd5e0787a42c5 (patch)
tree9f858ba43a5806c8b8ab7c8e4640e9d8962f9f12
parent8fa927e2b2fc81adb420285e470439fc3a28fcee (diff)
downloadpython-setuptools-git-1db80e46af67c5aa0ffebe3fc61dd5e0787a42c5.tar.gz
bpo-11191: skip unsupported test_distutils case for AIX with xlc (GH-8709)
Command line options for the xlc compiler behave differently from gcc and clang, so skip this test case for now when xlc is the compiler. Patch by aixtools (Michael Felt)
-rw-r--r--command/config.py1
-rw-r--r--tests/test_config_cmd.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/command/config.py b/command/config.py
index f511b888..aeda408e 100644
--- a/command/config.py
+++ b/command/config.py
@@ -328,7 +328,6 @@ class config(Command):
return self.try_cpp(body="/* No body */", headers=[header],
include_dirs=include_dirs)
-
def dump_file(filename, head=None):
"""Dumps a file content into log.info.
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 6e566e79..b735fd33 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -39,11 +39,17 @@ class ConfigTestCase(support.LoggingSilencer,
@unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
def test_search_cpp(self):
+ import shutil
cmd = missing_compiler_executable(['preprocessor'])
if cmd is not None:
self.skipTest('The %r command is not found' % cmd)
pkg_dir, dist = self.create_dist()
cmd = config(dist)
+ cmd._check_compiler()
+ compiler = cmd.compiler
+ is_xlc = shutil.which(compiler.preprocessor[0]).startswith("/usr/vac")
+ if is_xlc:
+ self.skipTest('xlc: The -E option overrides the -P, -o, and -qsyntaxonly options')
# simple pattern searches
match = cmd.search_cpp(pattern='xxx', body='/* xxx */')