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 <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

8 files changed, 36 insertions, 4 deletions

diff --git a/sources/pyside2/tests/QtNetwork/accessManager_test.py b/sources/pyside2/tests/QtNetwork/accessManager_test.py
index 95c882d26..12ed25317 100644
--- a/sources/pyside2/tests/QtNetwork/accessManager_test.py
+++ b/sources/pyside2/tests/QtNetwork/accessManager_test.py
@@ -32,7 +32,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.QtCore import *
 from PySide2.QtNetwork import *
diff --git a/sources/pyside2/tests/QtNetwork/bug_1084.py b/sources/pyside2/tests/QtNetwork/bug_1084.py
index 947ba1466..d2c273fca 100644
--- a/sources/pyside2/tests/QtNetwork/bug_1084.py
+++ b/sources/pyside2/tests/QtNetwork/bug_1084.py
@@ -32,7 +32,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 import QtNetwork
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtNetwork/bug_446.py b/sources/pyside2/tests/QtNetwork/bug_446.py
index 91333ef7a..f15ff01f9 100644
--- a/sources/pyside2/tests/QtNetwork/bug_446.py
+++ b/sources/pyside2/tests/QtNetwork/bug_446.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.QtCore import *
 from PySide2.QtNetwork import *
diff --git a/sources/pyside2/tests/QtNetwork/dnslookup_test.py b/sources/pyside2/tests/QtNetwork/dnslookup_test.py
index b0375b0f5..3a8b7a2d7 100644
--- a/sources/pyside2/tests/QtNetwork/dnslookup_test.py
+++ b/sources/pyside2/tests/QtNetwork/dnslookup_test.py
@@ -28,8 +28,14 @@
 
 '''Test cases for QDnsLookup'''
 
+import os
+import sys
 import unittest
 
+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.QtCore import QCoreApplication
 from PySide2.QtNetwork import QDnsLookup
 
diff --git a/sources/pyside2/tests/QtNetwork/qipv6address_test.py b/sources/pyside2/tests/QtNetwork/qipv6address_test.py
index 04e6c3fc4..046d4d850 100644
--- a/sources/pyside2/tests/QtNetwork/qipv6address_test.py
+++ b/sources/pyside2/tests/QtNetwork/qipv6address_test.py
@@ -28,8 +28,14 @@
 
 '''Test cases for QIPv6Address'''
 
+import os
+import sys
 import unittest
 
+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.QtNetwork import *
 
 class QIPv6AddressGetItemTest(unittest.TestCase):
diff --git a/sources/pyside2/tests/QtNetwork/qpassworddigestor_test.py b/sources/pyside2/tests/QtNetwork/qpassworddigestor_test.py
index 503ffecdc..13da3e733 100644
--- a/sources/pyside2/tests/QtNetwork/qpassworddigestor_test.py
+++ b/sources/pyside2/tests/QtNetwork/qpassworddigestor_test.py
@@ -30,8 +30,14 @@
 
 '''Test cases for QPasswordDigestor'''
 
+import os
+import sys
 import unittest
 
+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.QtCore import QByteArray, QCryptographicHash
 from PySide2.QtNetwork import QPasswordDigestor
 
diff --git a/sources/pyside2/tests/QtNetwork/tcpserver_test.py b/sources/pyside2/tests/QtNetwork/tcpserver_test.py
index afa332898..9a047e5c6 100644
--- a/sources/pyside2/tests/QtNetwork/tcpserver_test.py
+++ b/sources/pyside2/tests/QtNetwork/tcpserver_test.py
@@ -28,8 +28,14 @@
 
 '''Test cases for QTCPServer'''
 
+import os
+import sys
 import unittest
 
+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.QtNetwork import QTcpServer
 
 class ListenDefaultArgsCase(unittest.TestCase):
diff --git a/sources/pyside2/tests/QtNetwork/udpsocket_test.py b/sources/pyside2/tests/QtNetwork/udpsocket_test.py
index fc7f7b0d2..da5a21c29 100644
--- a/sources/pyside2/tests/QtNetwork/udpsocket_test.py
+++ b/sources/pyside2/tests/QtNetwork/udpsocket_test.py
@@ -32,7 +32,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.QtCore import QUrl, QObject, SIGNAL, QCoreApplication, QTimer
 from PySide2.QtNetwork import QUdpSocket, QHostAddress