diff options
| author | Michael Felt <aixtools@users.noreply.github.com> | 2018-12-28 14:03:17 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2018-12-28 14:03:17 (GMT) |
| commit | ed57e13df60ce28ba89bd49c9c5a15b1d9bf79c7 (patch) | |
| tree | 3e670a883533a64957a8d9514a539fc8878c66b0 | |
| parent | e2926b72488596f59e43c27f3b7cedf0c5b9e88e (diff) | |
| download | cpython-ed57e13df60ce28ba89bd49c9c5a15b1d9bf79c7.zip cpython-ed57e13df60ce28ba89bd49c9c5a15b1d9bf79c7.tar.gz cpython-ed57e13df60ce28ba89bd49c9c5a15b1d9bf79c7.tar.bz2 | |
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-- | Lib/distutils/command/config.py | 1 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_config_cmd.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2018-08-08-22-41-30.bpo-11191.eq9tSH.rst | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py index f511b88..aeda408 100644 --- a/Lib/distutils/command/config.py +++ b/Lib/distutils/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/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py index 6e566e7..b735fd3 100644 --- a/Lib/distutils/tests/test_config_cmd.py +++ b/Lib/distutils/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 */') diff --git a/Misc/NEWS.d/next/Tests/2018-08-08-22-41-30.bpo-11191.eq9tSH.rst b/Misc/NEWS.d/next/Tests/2018-08-08-22-41-30.bpo-11191.eq9tSH.rst new file mode 100644 index 0000000..d05d522 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-08-08-22-41-30.bpo-11191.eq9tSH.rst @@ -0,0 +1,2 @@ +Skip the distutils test 'test_search_cpp' when using XLC as compiler +patch by aixtools (Michael Felt) |