Hello community, here is the log from the commit of package med-tools for openSUSE:Factory checked in at 2019-11-07 23:16:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/med-tools (Old) and /work/SRC/openSUSE:Factory/.med-tools.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "med-tools" Thu Nov 7 23:16:14 2019 rev:2 rq:745559 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/med-tools/med-tools.changes 2019-02-24 17:17:36.148427016 +0100 +++ /work/SRC/openSUSE:Factory/.med-tools.new.2990/med-tools.changes 2019-11-07 23:16:25.776528409 +0100 @@ -1,0 +2,6 @@ +Tue Nov 5 19:10:30 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix failing python tests due to different filesystem layout of built + and installed modules, add use_installed_python_modules_for_tests.patch + +------------------------------------------------------------------- New: ---- use_installed_python_modules_for_tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ med-tools.spec ++++++ --- /var/tmp/diff_new_pack.sstvO2/_old 2019-11-07 23:16:27.284530060 +0100 +++ /var/tmp/diff_new_pack.sstvO2/_new 2019-11-07 23:16:27.292530069 +0100 @@ -26,8 +26,8 @@ Group: Productivity/Graphics/Other Version: 4.0.0 Release: 0 -Url: http://www.salome-platform.org/downloads/current-version -Source0: med-%{version}.tar.gz +Url: https://www.salome-platform.org/downloads/current-version +Source0: https://files.salome-platform.org/Salome/other/med-%{version}.tar.gz # PATCH-FIX-OPENSUSE Patch0: fix-cmakefiles.patch # PATCH-FIX-OPENSUSE @@ -40,6 +40,8 @@ Patch4: 0004-Fix-allocation-for-MEDfileName-consider-trailing-nul.patch # PATCH-FIX-OPENSUSE Patch5: 0005-Respect-DESTDIR-when-byte-compiling-python-code.patch +# PATCH-FIX-OPENSUSE +Patch6: use_installed_python_modules_for_tests.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc @@ -147,6 +149,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build @@ -179,8 +182,9 @@ %check cd build export LC_ALL=C.utf8 -export LD_LIBRARY_PATH=$PWD/src/ -make test +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} +export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python3_sitearch} +make test ARGS="--output-on-failure" %fdupes -s %{buildroot} ++++++ use_installed_python_modules_for_tests.patch ++++++ --- a/tests/python/CMakeLists.txt_orig 2019-11-05 20:01:34.223021137 +0100 +++ b/tests/python/CMakeLists.txt 2019-11-05 20:06:13.770123483 +0100 @@ -37,7 +37,7 @@ STRING(REPLACE ".py" "_Python" _tst_name ${_s}) FILE(COPY ${_s} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) ADD_TEST(NAME ${_tst_name} - COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}") + COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}") ENDFOREACH() INSTALL(FILES ${_to_install} DESTINATION bin/testpy)
