qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Require the PROTOC_EXECUTABLE definition in tests 

Require the PROTOC_EXECUTABLE definition when compiling
qtprotobufgen/qtgrpcgen tests.

Pick-to: 6.6 6.5
Change-Id: I5e207c8402dbccd5254d6a9687303e56ff7a4bbb
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
(cherry picked from commit f15db878a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-01-10 11:06:25 +01:00 committed by Qt Cherry-pick Bot
parent 327948194b
commit 2be1d6fa8c
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/grpcgen/tst_qtgrpcgen.cpp
View File

@ -20,15 +20,10 @@ const QLatin1StringView grpcGenQtprotobufKey(" --plugin=protoc-gen-qtgrpc=");
const QLatin1StringView optKey(" --qtgrpc_opt="); const QLatin1StringView optKey(" --qtgrpc_opt=");
const QLatin1StringView outputKey(" --qtgrpc_out="); const QLatin1StringView outputKey(" --qtgrpc_out=");
const QLatin1StringView includeKey(" -I"); const QLatin1StringView includeKey(" -I");
#if defined(PROTOC_EXECUTABLE) #ifndef PROTOC_EXECUTABLE
# error PROTOC_EXECUTABLE definition must be set and point to the valid protoc executable
#endif
const QLatin1StringView protocolBufferCompiler(XSTR(PROTOC_EXECUTABLE)); const QLatin1StringView protocolBufferCompiler(XSTR(PROTOC_EXECUTABLE));
#else
#if defined(Q_OS_WIN)
const QLatin1StringView protocolBufferCompiler("protoc.exe");
#else
const QLatin1StringView protocolBufferCompiler("protoc");
#endif
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
const QLatin1StringView qtgrpcgen("/qtgrpcgen.exe"); const QLatin1StringView qtgrpcgen("/qtgrpcgen.exe");
#else #else

11
tests/auto/protobufgen/tst_qtprotobufgen.cpp
View File

@ -25,15 +25,10 @@ const QLatin1StringView allow_proto3_optional(" --experimental_allow_proto3_opti
#else #else
const QLatin1StringView allow_proto3_optional(""); const QLatin1StringView allow_proto3_optional("");
#endif // ALLOW_PROTO3_OPTIONAL #endif // ALLOW_PROTO3_OPTIONAL
#if defined(PROTOC_EXECUTABLE) #ifndef PROTOC_EXECUTABLE
# error PROTOC_EXECUTABLE definition must be set and point to the valid protoc executable
#endif
const QLatin1StringView protocolBufferCompiler(XSTR(PROTOC_EXECUTABLE)); const QLatin1StringView protocolBufferCompiler(XSTR(PROTOC_EXECUTABLE));
#else
#if defined(Q_OS_WIN)
const QLatin1StringView protocolBufferCompiler("protoc.exe");
#else
const QLatin1StringView protocolBufferCompiler("protoc");
#endif
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
const QLatin1StringView qtprotobufgen("/qtprotobufgen.exe"); const QLatin1StringView qtprotobufgen("/qtprotobufgen.exe");
#else #else