From 4a8a2713433154aee21f1f83ef3e9e7dc9466275 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 12 Feb 2020 09:44:04 +0100 Subject: Fix running the PySide2 tests for Python 3.8/Windows On Windows, DLL directories can no longer be specified via the PATH environment variable. They need to be added via os.add_dll_directory(). In order to fix this, move the entire environment setup from CMake to a python helper and set the environment variables BUILD_DIR and QT_DIR pointing to the build directory and Qt directory, respectively, from CMake. In addition, this has a huge advantage: The tests can also be executed much more easily without ctest from the command line by just setting BUILD_DIR and QT_DIR instead of a complex manipulation of PATH/LD_LIBRARY_PATH. Change-Id: I7d518ccab19ca184c3112a126c779d4a6d7c6c5e Reviewed-by: Qt CI Bot Reviewed-by: Christian Tismer Reviewed-by: Cristian Maureira-Fredes --- sources/pyside2/tests/QtWidgets/standardpixmap_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sources/pyside2/tests/QtWidgets/standardpixmap_test.py') diff --git a/sources/pyside2/tests/QtWidgets/standardpixmap_test.py b/sources/pyside2/tests/QtWidgets/standardpixmap_test.py index c907c8209..12a5bea8e 100644 --- a/sources/pyside2/tests/QtWidgets/standardpixmap_test.py +++ b/sources/pyside2/tests/QtWidgets/standardpixmap_test.py @@ -30,7 +30,9 @@ import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util")) +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +from init_paths import init_test_paths +init_test_paths(False) from PySide2.QtGui import QPixmap from PySide2.QtWidgets import QStyle -- cgit v1.2.3