Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion btest
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ class Test:
error(f"cannot write test's additional file '{fname}'")

for line in lines:
ffile.write(line)
ffile.write(line.replace("\r\n", "\n"))

ffile.close()

Expand Down
6 changes: 5 additions & 1 deletion btest-bg-wait
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ function kill_procs {
}

function collect_output {
rm -f .stdout .stderr
# Truncate rather than rm: on Windows the parent process (btest)
# still holds these files open and rm would fail with EBUSY.
# Truncation is allowed because btest opens them with write-sharing.
: >.stdout
: >.stderr

if [ $timeout_ok != 1 ] && [ -s .timeout ]; then
{
Expand Down
Loading