diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-05-10 15:55:07 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-05-10 16:07:53 +0200 |
| commit | d3eab8f288bf083d7e345c08400301940f7365d2 (patch) | |
| tree | 88296a32bae798e9990e5a30558f23d4bee3e28c /tools/run_tests/helper_scripts | |
| parent | 149e06973e7b0fa74a404c1188a12ff481e7e38a (diff) | |
get rid of Jenkins specific yaml hack
Diffstat (limited to 'tools/run_tests/helper_scripts')
| -rw-r--r-- | tools/run_tests/helper_scripts/pre_build_cmake.bat | 6 | ||||
| -rw-r--r-- | tools/run_tests/helper_scripts/pre_build_csharp.bat | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tools/run_tests/helper_scripts/pre_build_cmake.bat b/tools/run_tests/helper_scripts/pre_build_cmake.bat index d89fc5fec2..f0777760aa 100644 --- a/tools/run_tests/helper_scripts/pre_build_cmake.bat +++ b/tools/run_tests/helper_scripts/pre_build_cmake.bat @@ -24,11 +24,7 @@ cd cmake mkdir build cd build -@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -@rem If yasm is not on the path, use hardcoded path instead. -yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" - -cmake -G %GENERATOR% -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../.. || goto :error +cmake -G %GENERATOR% -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=ON ../.. || goto :error endlocal diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat index 63f6645620..05c6cf0f61 100644 --- a/tools/run_tests/helper_scripts/pre_build_csharp.bat +++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat @@ -28,11 +28,7 @@ cd build mkdir %ARCHITECTURE% cd %ARCHITECTURE% -@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -@rem If yasm is not on the path, use hardcoded path instead. -yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" - -cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../../.. || goto :error +cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON ../../.. || goto :error cd ..\..\..\src\csharp |