Skip to content
Snippets Groups Projects
Commit 310adb9a authored by Albert  Babí Oller's avatar Albert Babí Oller Committed by Albert Babí Oller
Browse files

cqfd: add Ubuntu 20.10 Dockerfile and other test fixes

- add Ubuntu 20.10 Dockerfile to build with cqfd
- set symlink to Ubuntu 20.10 Dockerfile instead of Debian 11
- fix packages on Debian Dockerfile
- add subdirectory tests and dummy_test to CMakeLists.txt

Change-Id: I13d21e2b9e53d456ec1d7a53962860912397d9c7
parent 921ddeab
No related branches found
No related tags found
No related merge requests found
......@@ -147,3 +147,5 @@ target_link_libraries(jami-qt
${QML_LIBS}
${ringclient}
${qrencode})
add_subdirectory(tests)
Dockerfile_debian_11
\ No newline at end of file
Dockerfile_ubuntu_20.10
\ No newline at end of file
FROM debian:bullseye-20200908
FROM debian:bullseye
ENV DEBIAN_FRONTEND noninteractive
ENV QT_QUICK_BACKEND software
......@@ -6,7 +6,7 @@ ENV QT_QPA_PLATFORM offscreen
RUN apt-get clean
RUN apt-get update
RUN apt-get install -y -o Acquire::Retires=10 \
RUN apt-get install -y -o Acquire::Retries=10 \
python3 \
git \
autoconf \
......@@ -74,7 +74,7 @@ RUN apt-get install -y qtmultimedia5-dev \
qml-module-qtquick-privatewidgets \
qml-module-qtquick-shapes \
qml-module-qtquick-window2 \
qml-module-qtquick-templates2
qml-module-qtquick-templates2 \
qml-module-qt-labs-platform \
qml-module-qtwebengine \
qml-module-qtwebchannel \
......
FROM ubuntu:20.10
ENV DEBIAN_FRONTEND noninteractive
ENV QT_QUICK_BACKEND software
ENV QT_QPA_PLATFORM offscreen
RUN apt-get clean
RUN apt-get update && \
apt-get install -y devscripts equivs
RUN apt-get install -y -o Acquire::Retries=10 \
python3 \
git \
autoconf \
automake \
autopoint \
cmake \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
libargon2-0-dev \
libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
libgtk-3-dev \
libnotify-dev \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
yasm \
nasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
RUN apt-get install -y qtmultimedia5-dev \
libqt5svg5-dev \
qtwebengine5-dev \
qtdeclarative5-dev \
qtquickcontrols2-5-dev \
libqt5svg5-dev \
qml-module-qtquick2 \
qml-module-qtquick-controls \
qml-module-qtquick-controls2 \
qml-module-qtquick-dialogs \
qml-module-qtquick-layouts \
qml-module-qtquick-privatewidgets \
qml-module-qtquick-shapes \
qml-module-qtquick-window2 \
qml-module-qtquick-templates2 \
qml-module-qt-labs-platform \
qml-module-qtwebengine \
qml-module-qtwebchannel \
qml-module-qttest \
pandoc \
googletest \
libgtest-dev
\ No newline at end of file
......@@ -6,7 +6,8 @@ set(QMLTEST_LIBS ${QML_LIBS} Qt5::QuickTest)
set(TESTS_INCLUDES
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/tests/qml)
${CMAKE_SOURCE_DIR}/tests/qml
${CMAKE_SOURCE_DIR}/tests/unittests)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src
......@@ -43,6 +44,7 @@ add_test(NAME QmlTests COMMAND qml_tests -input ${PROJECT_SOURCE_DIR}/tests/qml/
# Unittests
add_executable(unittests
${CMAKE_SOURCE_DIR}/tests/unittests/main_unittests.cpp
${CMAKE_SOURCE_DIR}/tests/unittests/dummy_unittest.cpp
${QML_RESOURCES}
${QML_RESOURCES_QML}
$<TARGET_OBJECTS:test_common_obj>)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment