Skip to content

Commit 21be1c7

Browse files
committed
Fix extraction of test shard info under windows
1 parent 400b0ec commit 21be1c7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

private/ct_sharded.bzl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ set -x
119119
script = """@echo off
120120
echo Erlang Version: {erlang_version}
121121
122-
if defined TEST_SHARD_STATUS_FILE copy /b %TEST_SHARD_STATUS_FILE% +,,
122+
SETLOCAL EnableDelayedExpansion
123+
if defined TEST_SHARD_STATUS_FILE type nul > !TEST_SHARD_STATUS_FILE!
123124
124125
REM TEST_SRCDIR is provided by bazel but with unix directory separators
125126
set dir=%TEST_SRCDIR%/%TEST_WORKSPACE%/{dir}
@@ -148,7 +149,11 @@ set SHARD_SUITE_CODE_PATHS=%TEST_SRCDIR%/%TEST_WORKSPACE%/{dir}
148149
set SHARD_SUITE_CODE_PATHS=%SHARD_SUITE_CODE_PATHS:/=\\%
149150
set shard_suite_tool_path=%TEST_SRCDIR%/%TEST_WORKSPACE%/{shard_suite}
150151
set shard_suite_tool_path=%shard_suite_tool_path:/=\\%
151-
set FILTER=("{erlang_home}"\\bin\\escript %shard_suite_tool_path% -{sharding_method} {suite_name} %TEST_SHARD_INDEX% %TEST_TOTAL_SHARDS%)
152+
"{erlang_home}"\\bin\\escript %shard_suite_tool_path% ^
153+
-{sharding_method} {suite_name} %TEST_SHARD_INDEX% %TEST_TOTAL_SHARDS% ^
154+
> shard.tmp
155+
set /p FILTER= < shard.tmp
156+
DEL shard.tmp
152157
goto :run_test
153158
:no_focus_no_shard
154159
set FILTER=-suite {suite_name}

0 commit comments

Comments
 (0)