Skip to content
Snippets Groups Projects
Commit c013e1a6 authored by Schrödter, Tobias's avatar Schrödter, Tobias
Browse files

Resolve "Significant differences between linux and windows results"

Closes #31

See merge request !39
parents 1ad3b8c2 be7122ae
No related branches found
No related tags found
No related merge requests found
......@@ -50,20 +50,19 @@ unit_test_linux:
reports:
junit: "build/tests/unit_test/unit_test_report.xml"
# Currently disabled
# Execute regression tests
#regression_test_linux:
# image: $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}_linux
# stage: test
# script:
# - cd tests/regression_test/tests
# - python -m pytest --path=../../../build/petrack --junitxml=pytest_report.xml >> "RegressionTestLog.txt"
# artifacts:
# when: on_failure
# paths:
# - "tests/regression_test/tests/RegressionTestLog.txt"
# reports:
# junit: "tests/regression_test/tests/pytest_report.xml"
regression_test_linux:
image: $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}_linux
stage: test
script:
- cd tests/regression_test/tests
- python -m pytest --path=../../../build/petrack --junitxml=pytest_report.xml >> "RegressionTestLog.txt"
artifacts:
when: on_failure
paths:
- "tests/regression_test/tests/RegressionTestLog.txt"
reports:
junit: "tests/regression_test/tests/pytest_report.xml"
###############################################################################
......
......@@ -122,7 +122,7 @@ find_package(
REQUIRED)
# OpenCV
find_package(OpenCV 4.0.0 REQUIRED )
find_package(OpenCV 4.2.0 EXACT REQUIRED )
message("Building with OpenCV${OpenCV_VERSION_MAJOR}(${OpenCV_VERSION})")
# QWT
......
......@@ -3,6 +3,7 @@ FROM archlinux:20200705
# Update the repositories
RUN pacman -Syy
# Install the needed tools
RUN pacman -Syu --needed --noconfirm \
git \
gcc \
......@@ -11,14 +12,23 @@ RUN pacman -Syu --needed --noconfirm \
base-devel \
glew
# Install the needed libraries
RUN pacman -Syu --needed --noconfirm \
qt5-base \
opencv hdf5 vtk\
qwt \
catch2
# Install python
RUN pacman -Syu --needed --noconfirm \
python \
python-pip
RUN pip install pytest
# Install opencv 4.2 (last command to avoid any updates by pacman)
RUN pacman --needed --noconfirm -U \
https://archive.archlinux.org/packages/h/hdf5/hdf5-1.10.5-1-x86_64.pkg.tar.xz \
https://archive.archlinux.org/packages/v/vtk/vtk-8.2.0-9-x86_64.pkg.tar.xz \
https://archive.archlinux.org/packages/g/glew/glew-2.1.0-1-x86_64.pkg.tar.xz \
https://archive.archlinux.org/packages/o/openexr/openexr-2.4.0-6-x86_64.pkg.tar.xz \
https://archive.archlinux.org/packages/o/opencv/opencv-4.2.0-1-x86_64.pkg.tar.xz
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment