From cc6630d0e6b89327287a923a48aeebeda2ac6ca9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 14 Mar 2023 22:17:51 +0100 Subject: Remove UBSAN suppressions file It's not relevant anymore without QtScript. Change-Id: Iafb56f71764f8334a1e983cdb83014ac847deed3 Reviewed-by: Ivan Komissarov --- scripts/build-qbs-with-qbs.sh | 1 - scripts/undefined-sanitizer-suppressions.txt | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 scripts/undefined-sanitizer-suppressions.txt diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index 327d63acf..b26dcc7b5 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -44,7 +44,6 @@ set -e # Suppress findings in some parts of Qbs / dependencies. # export LSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/address-sanitizer-suppressions.txt:print_suppressions=0" -export UBSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/undefined-sanitizer-suppressions.txt" if [ -z "${QBS_BUILD_PROFILE}" ]; then QBS_BUILD_PROFILE=$(qbs config defaultProfile | cut -d: -f2 | tr -d '[:space:]') diff --git a/scripts/undefined-sanitizer-suppressions.txt b/scripts/undefined-sanitizer-suppressions.txt deleted file mode 100644 index 87f74533d..000000000 --- a/scripts/undefined-sanitizer-suppressions.txt +++ /dev/null @@ -1,3 +0,0 @@ -shift:SymbolTable.h -alignment:qscriptengine_p.h - -- cgit v1.2.3 From 66562560fcbe0271407560dd1d446c42a70252e5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 16 Mar 2023 17:22:13 +0100 Subject: grpc: Fix macOS CI again Change-Id: I224ace97588400f540f155eed68495345f1d55a9 Reviewed-by: Ivan Komissarov --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7adf33c80..2da8bf997 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -617,7 +617,7 @@ jobs: QTEST_FUNCTION_TIMEOUT: 9000000 QBS_AUTOTEST_PROFILE: 'qt' QBS_TEST_SOURCE_ROOT: 'tests' - QBS_EXTRA_GRPC_LIBS: 'absl_synchronization,gpr' + QBS_EXTRA_GRPC_LIBS: 'absl_synchronization,grpc,gpr' strategy: fail-fast: false matrix: -- cgit v1.2.3 From 0319b0acc7a11f9ba84d8708d8e88575470ca75c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 16 Mar 2023 17:13:06 +0100 Subject: grpc: Bump C++ language version in the autotest again The generated code makes use of it these days. Change-Id: I90460a15630cfb55f274da3484d59bf6f1a2e4ec Reviewed-by: Ivan Komissarov --- tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs index a7debfa07..dd2184c7e 100644 --- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs +++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs @@ -11,7 +11,7 @@ CppApplication { } Depends { name: "cpp" } - cpp.cxxLanguageVersion: "c++14" + cpp.cxxLanguageVersion: "c++17" cpp.minimumMacosVersion: "10.8" cpp.warningLevel: "none" -- cgit v1.2.3