bootloader/tests: Drop apple traceback (pyinstaller#4875) and unskip …

…QtQml tests on macOS * tests: unskip QtQml tests for macOS. This reverts commit 6aebb5c. * bootloader: Don't use the traceback added in pyinstaller#4592 when running on macOS See pyinstaller#4860.
cool-RR · Jun 20, 2020 · 183d8f0 · 183d8f0
1 parent 62317be
commit 183d8f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/bootloader/src/pyi_launch.c b/bootloader/src/pyi_launch.c
@@ -420,7 +420,7 @@ pyi_launch_run_scripts(ARCHIVE_STATUS *status)
             if (!retval) {
                 FATALERROR("Failed to execute script %s\n", ptoc->name);
 
-                #if defined(WINDOWED) && defined(LAUNCH_DEBUG)
+                #if defined(WINDOWED) && defined(LAUNCH_DEBUG) && !defined(__APPLE__)
                 /* Visual C++ requires all variables to be declared before any
                  * statements in a given block. The curly braces below create a
                  * block to make this compiler happy. */
@@ -466,11 +466,11 @@ pyi_launch_run_scripts(ARCHIVE_STATUS *status)
                     Py_DECREF(module);
                 }
 
-                #else /* if defined(WINDOWED) and defined(LAUNCH_DEBUG) */
+                #else /* if defined(WINDOWED) and defined(LAUNCH_DEBUG) and not defined(__APPLE__) */
 
                     PI_PyErr_Print();
 
-                #endif /* if defined(WINDOWED) and defined(LAUNCH_DEBUG) */
+                #endif /* if defined(WINDOWED) and defined(LAUNCH_DEBUG) and not defined(__APPLE__) */
 
                 return -1;
             }

diff --git a/news/4213.bootloader.rst b/news/4213.bootloader.rst
@@ -1 +1 @@
-In debug and windowed mode, print traceback to help debug pyiboot01_bootstrap errors.
+In debug and windowed mode on non-macOS platforms, print traceback to help debug pyiboot01_bootstrap errors.
diff --git a/news/4592.bootloader.rst b/news/4592.bootloader.rst
@@ -1 +1 @@
-In debug and windowed mode, print traceback to help debug pyiboot01_bootstrap errors.
+In debug and windowed mode on non-macOS platforms, print traceback to help debug pyiboot01_bootstrap errors.
diff --git a/tests/functional/test_libraries.py b/tests/functional/test_libraries.py
@@ -318,7 +318,6 @@ def _replacement_find_executables(self, name):
 
 @PYQT5_NEED_OPENGL
 @QtPyLibs
-@skipif(is_darwin, reason='Issue #4860')
 def test_Qt5_QtQml(pyi_builder, QtPyLib, monkeypatch):
     path_clean(monkeypatch, QtPyLib)
     pytest.importorskip(QtPyLib)