Author: Sam James Date: 2023-01-23T21:15:10Z New Revision: 136f77805fd89cd30e69b3d1204fbf7efedd9a12
URL: https://github.com/llvm/llvm-project/commit/136f77805fd89cd30e69b3d1204fbf7efedd9a12 DIFF: https://github.com/llvm/llvm-project/commit/136f77805fd89cd30e69b3d1204fbf7efedd9a12.diff LOG: [Clang] [Python] Fix tests when default config file contains -include In Gentoo, we make use of Clang's recently-enhanced config file support and add a default include to `clang` invocations using '-include ...'. This breaks clang-python tests like so: ``` ====================================================================== ERROR: test_includes (tests.cindex.test_translation_unit.TestTranslationUnit) ---------------------------------------------------------------------- Traceback (most recent call last): File "/var/tmp/portage/dev-python/clang-python-15.0.6/work/clang/bindings/python/tests/cindex/test_translation_unit.py", line 145, in test_includes eq(i[0], i[1]) File "/var/tmp/portage/dev-python/clang-python-15.0.6/work/clang/bindings/python/tests/cindex/test_translation_unit.py", line 132, in eq self.assert_normpaths_equal(expected[0], actual.source.name) AttributeError: 'NoneType' object has no attribute 'name' ====================================================================== FAIL: test_inclusion_directive (tests.cindex.test_translation_unit.TestTranslationUnit) ---------------------------------------------------------------------- Traceback (most recent call last): File "/var/tmp/portage/dev-python/clang-python-15.0.6/work/clang/bindings/python/tests/cindex/test_translation_unit.py", line 157, in test_inclusion_directive self.assert_normpaths_equal(i[0], i[1]) File "/var/tmp/portage/dev-python/clang-python-15.0.6/work/clang/bindings/python/tests/cindex/test_translation_unit.py", line 126, in assert_normpaths_equal self.assertEqual(os.path.normpath(path1), AssertionError: '/var/tmp/portage/dev-python/clang-python-1[58 chars]r1.h' != '/usr/include/gentoo/fortify.h' - /var/tmp/portage/dev-python/clang-python-15.0.6/work/clang/bindings/python/tests/cindex/INPUTS/header1.h + /usr/include/gentoo/fortify.h ``` Disable using the default Clang configuration files on the system, like we did for other tests. Bug: https://bugs.gentoo.org/890204 Differential Revision: https://reviews.llvm.org/D141248 Added: Modified: clang/bindings/python/tests/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/bindings/python/tests/CMakeLists.txt b/clang/bindings/python/tests/CMakeLists.txt index 5127512fe312f..c4cd2539e9d6c 100644 --- a/clang/bindings/python/tests/CMakeLists.txt +++ b/clang/bindings/python/tests/CMakeLists.txt @@ -1,7 +1,10 @@ # Test target to run Python test suite from main build. +# Avoid configurations including '-include' from interfering with +# our tests by setting CLANG_NO_DEFAULT_CONFIG. add_custom_target(check-clang-python COMMAND ${CMAKE_COMMAND} -E env + CLANG_NO_DEFAULT_CONFIG=1 CLANG_LIBRARY_PATH=$<TARGET_FILE_DIR:libclang> "${Python3_EXECUTABLE}" -m unittest discover DEPENDS libclang _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
