Merge 4dfee47c5d into 83b92ceb35

* Disable print_destroyed in tests on GraalPy

* Reenable test_iostream on GraalPy

tests/constructor_stats.h

@@ -312,8 +312,16 @@ void print_created(T *inst, Values &&...values) {
 }
 template <class T, typename... Values>
 void print_destroyed(T *inst, Values &&...values) { // Prints but doesn't store given values
+    /*
+     * On GraalPy, destructors can trigger anywhere and this can cause random
+     * failures in unrelated tests.
+     */
+#if !defined(GRAALVM_PYTHON)
     print_constr_details(inst, "destroyed", values...);
     track_destroyed(inst);
+#else
+    py::detail::silence_unused_warnings(inst, values...);
+#endif
 }
 template <class T, typename... Values>
 void print_values(T *inst, Values &&...values) {

tests/test_iostream.py

@@ -6,14 +6,8 @@ from io import StringIO
 
 import pytest
 
-import env  # noqa: F401
 from pybind11_tests import iostream as m
 
-pytestmark = pytest.mark.skipif(
-    "env.GRAALPY",
-    reason="Delayed prints from finalizers from other tests can end up in the output",
-)
-
 
 def test_captured(capsys):
     msg = "I've been redirected to Python, I hope!"

tools/pybind11NewTools.cmake

@@ -307,7 +307,7 @@ function(pybind11_add_module target_name)
   if(DEFINED CMAKE_BUILD_TYPE) # see https://github.com/pybind/pybind11/issues/4454
     # Use case-insensitive comparison to match the result of $<CONFIG:cfgs>
     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-    if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO)
+    if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO|NONE)
       # Strip unnecessary sections of the binary on Linux/macOS
       pybind11_strip(${target_name})
     endif()

tools/pybind11Tools.cmake

@@ -196,7 +196,7 @@ function(pybind11_add_module target_name)
   if(DEFINED CMAKE_BUILD_TYPE) # see https://github.com/pybind/pybind11/issues/4454
     # Use case-insensitive comparison to match the result of $<CONFIG:cfgs>
     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-    if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO)
+    if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO|NONE)
       pybind11_strip(${target_name})
     endif()
   endif()