Skip to content

Commit

Permalink
Revert "[Test] Dedup vs2019 test in the Windows test" (#33393)
Browse files Browse the repository at this point in the history
Reverts #33385

Temporary revert to unblock #33138
  • Loading branch information
veblush committed Jun 9, 2023
1 parent a4ab4d0 commit e9e5dc0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
6 changes: 0 additions & 6 deletions tools/internal_ci/windows/grpc_run_tests_matrix.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ IF "%cd%"=="T:\src" (
)
endlocal

@rem Info on disk usage
dir t:\

@rem enter repo root
cd /d %~dp0\..\..\..

Expand All @@ -51,7 +48,4 @@ set RUNTESTS_EXITCODE=%errorlevel%
@rem show ccache stats
ccache --show-stats

@rem Info on disk usage after test
dir t:\

exit /b %RUNTESTS_EXITCODE%
19 changes: 9 additions & 10 deletions tools/run_tests/run_tests_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,15 @@ def _create_portability_test_jobs(extra_args=[],
# TODO(jtattermusch): The C tests with exactly the same config are already running as part of the
# basictests_c suite (so we force --build_only to avoid running them twice).
# The C++ tests aren't all passing, so also force --build_only.
# NOTE(veblush): This is not neded as default=cmake_ninja_vs2019
#test_jobs += _generate_jobs(languages=['c', 'c++'],
# configs=['dbg'],
# platforms=['windows'],
# arch='x64',
# compiler='cmake_ninja_vs2019',
# labels=['portability', 'corelang'],
# extra_args=extra_args + ['--build_only'],
# inner_jobs=inner_jobs,
# timeout_seconds=_CPP_RUNTESTS_TIMEOUT)
test_jobs += _generate_jobs(languages=['c', 'c++'],
configs=['dbg'],
platforms=['windows'],
arch='x64',
compiler='cmake_ninja_vs2019',
labels=['portability', 'corelang'],
extra_args=extra_args + ['--build_only'],
inner_jobs=inner_jobs,
timeout_seconds=_CPP_RUNTESTS_TIMEOUT)

# C and C++ with no-exceptions on Linux
test_jobs += _generate_jobs(languages=['c', 'c++'],
Expand Down

0 comments on commit e9e5dc0

Please sign in to comment.