mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Increase CI test coverage by changing GCC to ICC
There is already other place in which we compile with GCC on Linux. As we use ninja now, it has to be installed on open suse too. Cmake port depends on system libraries therefore pcre2 needs to be installed. Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6 Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
@@ -2,10 +2,10 @@
|
||||
Compiler: 'GCC'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF'
|
||||
- Template: 'qtci-linux-Ubuntu-18.04-x86_64'
|
||||
Compiler: 'GCC'
|
||||
- Template: 'qtci-linux-openSUSE-15.0-x86_64'
|
||||
Compiler: 'ICC_18'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF'
|
||||
Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc'
|
||||
- Template: 'qtci-macos-10.13-x86_64-2'
|
||||
Compiler: 'Clang'
|
||||
Features: ['DisableTests']
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
sudo zypper -nq install git gcc7 gcc7-c++
|
||||
sudo zypper -nq install git gcc7 gcc7-c++ ninja
|
||||
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
|
||||
--slave /usr/bin/g++ g++ /usr/bin/g++-7 \
|
||||
--slave /usr/bin/cc cc /usr/bin/gcc-7 \
|
||||
@@ -17,7 +17,8 @@ sudo zypper -nq install bison flex gperf \
|
||||
fontconfig-devel \
|
||||
sqlite3-devel \
|
||||
libxkbcommon-devel \
|
||||
libxkbcommon-x11-devel
|
||||
libxkbcommon-x11-devel \
|
||||
pcre2-devel libpng16-devel
|
||||
|
||||
# EGL support
|
||||
sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel
|
||||
|
||||
Reference in New Issue
Block a user