diff options
Diffstat (limited to 'sources/pyside2/tests/CMakeLists.txt')
| -rw-r--r-- | sources/pyside2/tests/CMakeLists.txt | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/sources/pyside2/tests/CMakeLists.txt b/sources/pyside2/tests/CMakeLists.txt index 08585252c..285ea872f 100644 --- a/sources/pyside2/tests/CMakeLists.txt +++ b/sources/pyside2/tests/CMakeLists.txt @@ -5,23 +5,11 @@ else() set(CTEST_TESTING_TIMEOUT 60) endif() - # tests/QtWidgets/qstandarditemmodel_test.py needs shiboken2 - # tests/QtWidgets/qlabel_test.py needs shiboken2 - if(WIN32) - set(TEST_PYTHONPATH "${CMAKE_BINARY_DIR};${CMAKE_SOURCE_DIR}/tests/util;${CMAKE_BINARY_DIR}/tests/pysidetest;${SHIBOKEN_PYTHON_MODULE_DIR};$ENV{PYTHONPATH}") - set(TEST_LIBRARY_PATH "${libpyside_BINARY_DIR};${pysidetest_BINARY_DIR};${SHIBOKEN_SHARED_LIBRARY_DIR};$ENV{PATH}") - set(LIBRARY_PATH_VAR "PATH") - string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}") - string(REPLACE "\\" "/" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}") - - string(REPLACE ";" "\\;" TEST_PYTHONPATH "${TEST_PYTHONPATH}") - string(REPLACE ";" "\\;" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}") - else() - set(TEST_PYTHONPATH "${CMAKE_BINARY_DIR}:${CMAKE_SOURCE_DIR}/tests/util:${CMAKE_BINARY_DIR}/tests/pysidetest:${CMAKE_BINARY_DIR}/../shiboken2/shibokenmodule:$ENV{PYTHONPATH}") - set(TEST_LIBRARY_PATH "${libpyside_BINARY_DIR}:${pysidetest_BINARY_DIR}:$ENV{LD_LIBRARY_PATH}") - set(LIBRARY_PATH_VAR "LD_LIBRARY_PATH") - endif() - + # BUILD_DIR and QT_DIR are used by init_paths.py for setting + # the path to the testbinding module + get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY) + get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY) + set(QT_DIR "${_qt5Core_install_prefix}") macro(TEST_QT_MODULE var name) if(NOT DISABLE_${name} AND ${var}) @@ -46,7 +34,7 @@ else() set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT} WILL_FAIL ${EXPECT_TO_FAIL} - ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};${LIBRARY_PATH_VAR}=${TEST_LIBRARY_PATH};PYSIDE_DISABLE_INTERNAL_QT_CONF=1;QT_NO_GLIB=1") + ENVIRONMENT "BUILD_DIR=${BUILD_DIR};QT_DIR=${QT_DIR};PYSIDE_DISABLE_INTERNAL_QT_CONF=1;QT_NO_GLIB=1") endmacro() if (NOT DISABLE_QtCore AND NOT DISABLE_QtGui AND NOT DISABLE_QtWidgets) @@ -58,7 +46,7 @@ else() foreach(shortname IN LISTS all_module_shortnames) message(STATUS "preparing tests for module 'Qt${shortname}'") - TEST_QT_MODULE(Qt5${shortname}_FOUND Qt${shortname}) + TEST_QT_MODULE(Qt${QT_MAJOR_VERSION}${shortname}_FOUND Qt${shortname}) endforeach() #platform specific |