diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-02-05 22:54:39 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-02-06 12:17:48 +0000 |
| commit | fca0da45c5ce7fcc5dbb3903c7457451e6694ec5 (patch) | |
| tree | a90b4ca7a66567dd4b82d304b88be0b9350de704 | |
| parent | 58846b6286ac064e4a5b31129851335526a19989 (diff) | |
Install some packages on Mac jobs to run more tests
Change-Id: I90865ba6908df1550c2646a57d348dcb82e244ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | examples/grpc/ping-pong-grpc.qbs | 10 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 47a103a62..0538b7e3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,8 +78,12 @@ jobs: addons: homebrew: packages: - - p7zip - ccache + - grpc + - icoutils + - makensis + - protobuf + - p7zip update: true env: # Address sanitizer slows autotests down too much. @@ -89,7 +93,7 @@ jobs: PATH="${QT_INSTALL_DIR}/Qt Creator.app/Contents/MacOS:${PATH}" QBS_BUILD_PROFILE=qt before_install: - - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} qtbase qtdeclarative qttools qtscript + - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} qtbase qtdeclarative qttools qtscript qtscxml - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator - pip2 install --user beautifulsoup4 lxml script: diff --git a/examples/grpc/ping-pong-grpc.qbs b/examples/grpc/ping-pong-grpc.qbs index 8d8909350..242408898 100644 --- a/examples/grpc/ping-pong-grpc.qbs +++ b/examples/grpc/ping-pong-grpc.qbs @@ -40,8 +40,13 @@ Project { protobuf.cpp.useGrpc: true consoleApplication: true cpp.cxxLanguageVersion: "c++17" + cpp.minimumMacosVersion: "10.8" name: "client" files: "client.cpp" + Properties { + condition: qbs.toolchain.contains("gcc") + cpp.cxxFlags: "-Wno-deprecated-declarations" + } Group { files: "ping-pong-grpc.proto" fileTags: "protobuf.grpc" @@ -55,8 +60,13 @@ Project { protobuf.cpp.useGrpc: true consoleApplication: true cpp.cxxLanguageVersion: "c++17" + cpp.minimumMacosVersion: "10.8" name: "server" files: "client.cpp" + Properties { + condition: qbs.toolchain.contains("gcc") + cpp.cxxFlags: "-Wno-deprecated-declarations" + } Group { files: "ping-pong-grpc.proto" fileTags: "protobuf.grpc" diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs index 8ee3dd9c9..b7a594c13 100644 --- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs +++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs @@ -7,6 +7,7 @@ CppApplication { Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++11" + cpp.minimumMacosVersion: "10.8" cpp.warningLevel: "none" Depends { name: "protobuf.cpp"; required: false } |