Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-19 17:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiler_info MSVC fix. num_violations == 0 condition.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-06-22 17:41:11 -07:00
parent 0d2bf264c8
commit 491c2c7983
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pybind11_tests.cpp
View File

@ -79,7 +79,7 @@ PYBIND11_MODULE(pybind11_tests, m) {
m.doc() = "pybind11 test module"; m.doc() = "pybind11 test module";
#if defined(_MSC_FULL_VER) #if defined(_MSC_FULL_VER)
m.attr("compiler_info") = "MSVC " _MSC_FULL_VER; m.attr("compiler_info") = "MSVC " PYBIND11_TOSTRING(_MSC_FULL_VER);
#elif defined(__VERSION__) #elif defined(__VERSION__)
m.attr("compiler_info") = __VERSION__; m.attr("compiler_info") = __VERSION__;
#else #else

8
tests/test_type_caster_odr_guard_1.py
View File

@ -36,7 +36,13 @@ def test_type_caster_odr_violation_detected_counter():
num_violations = m.type_caster_odr_violation_detected_count() num_violations = m.type_caster_odr_violation_detected_count()
if num_violations is None: if num_violations is None:
pytest.skip("type_caster_odr_violation_detected_count() is None") pytest.skip("type_caster_odr_violation_detected_count() is None")
elif num_violations == 0: elif num_violations == 0 and (
# 3.9-dbg (deadsnakes) Valgrind x64:
# This failure is unexplained and the condition here is not completely specific,
# but deemed a good-enough workaround.
pybind11_tests.compiler_info == "9.4.0"
and pybind11_tests.cpp_std == "C++17"
):
pytest.skip( pytest.skip(
"UNEXPECTED: type_caster_odr_violation_detected_count() == 0 (%s %s)" "UNEXPECTED: type_caster_odr_violation_detected_count() == 0 (%s %s)"
% (pybind11_tests.compiler_info, pybind11_tests.cpp_std) % (pybind11_tests.compiler_info, pybind11_tests.cpp_std)