diff --git a/tools/run_tests/helper_scripts/build_cxx.sh b/tools/run_tests/helper_scripts/build_cxx.sh index 882123e4093..985f50856bf 100755 --- a/tools/run_tests/helper_scripts/build_cxx.sh +++ b/tools/run_tests/helper_scripts/build_cxx.sh @@ -39,8 +39,12 @@ cd ../../.. mkdir -p cmake/build cd cmake/build -# MSBUILD_CONFIG's values are suitable for cmake as well +# TODO(yashykt/veblush): Remove workaround after fixing b/332425004 +if [ "${GRPC_RUNTESTS_ARCHITECTURE}" = "x86" ]; then +cmake -DCMAKE_CXX_STANDARD=14 -DgRPC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE="${MSBUILD_CONFIG}" "$@" ../.. +else cmake -DCMAKE_CXX_STANDARD=14 -DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=ON -DgRPC_ABSL_PROVIDER=package -DgRPC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE="${MSBUILD_CONFIG}" -DCMAKE_INSTALL_PREFIX="${INSTALL_PATH}" "$@" ../.. +fi # GRPC_RUN_TESTS_CXX_LANGUAGE_SUFFIX will be set to either "c" or "cxx" make -j"${GRPC_RUN_TESTS_JOBS}" "buildtests_${GRPC_RUN_TESTS_CXX_LANGUAGE_SUFFIX}" "tools_${GRPC_RUN_TESTS_CXX_LANGUAGE_SUFFIX}" diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 5eb30557651..e892b6b7d6e 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -534,6 +534,8 @@ class CLanguage(object): environ[ "GRPC_BUILD_VS_TOOLS_ARCHITECTURE" ] = self._vs_tools_architecture_windows + elif self.platform == "linux": + environ["GRPC_RUNTESTS_ARCHITECTURE"] = self.args.arch return environ def post_tests_steps(self):