Skip to content

Commit f148571

Browse files
iancha1992fmeum
andauthored
Set GTEST_SHARD_STATUS_FILE in test setup (#18482)
googletest only reads `GTEST_SHARD_STATUS_FILE`, not `TEST_SHARD_STATUS_FILE`, so this variable has to be set to keep sharded `cc_test`s relying on the test framework working with `--incompatible_check_sharding_support`. Closes #18469. PiperOrigin-RevId: 534375567 Change-Id: I0ca909cc7eb0b0f28f756e90e333e6bf39a0954d Co-authored-by: Fabian Meumertzheim <[email protected]>
1 parent 53d785b commit f148571

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

tools/test/test-setup.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ export -n TEST_UNDECLARED_OUTPUTS_ANNOTATIONS
102102
if [[ -n "${TEST_TOTAL_SHARDS+x}" ]] && ((TEST_TOTAL_SHARDS != 0)); then
103103
export GTEST_SHARD_INDEX="${TEST_SHARD_INDEX}"
104104
export GTEST_TOTAL_SHARDS="${TEST_TOTAL_SHARDS}"
105+
export GTEST_SHARD_STATUS_FILE="${TEST_SHARD_STATUS_FILE}"
105106
fi
106107
export GTEST_TMP_DIR="${TEST_TMPDIR}"
107108

tools/test/windows/tw.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,10 @@ bool ExportGtestVariables(const Path& test_tmpdir) {
615615
}
616616
if (total_shards_value > 0) {
617617
std::wstring shard_index;
618-
if (!GetEnv(L"TEST_SHARD_INDEX", &shard_index) ||
618+
std::wstring shard_status_file;
619+
if (!GetEnv(L"TEST_SHARD_STATUS_FILE", &shard_status_file) ||
620+
!GetEnv(L"TEST_SHARD_INDEX", &shard_index) ||
621+
!SetEnv(L"GTEST_SHARD_STATUS_FILE", shard_status_file) ||
619622
!SetEnv(L"GTEST_SHARD_INDEX", shard_index) ||
620623
!SetEnv(L"GTEST_TOTAL_SHARDS", total_shards_str)) {
621624
return false;

0 commit comments

Comments
 (0)