tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-15 00:13:43 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

tinygo test: simplify output buffering

Browse Source
This commit is contained in:
Nia Waldvogel
2021-12-30 10:17:35 -05:00
committed by Nia
parent f1b15db258
commit f9f2349850
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.go
+12 -16
View File
@@ -1641,15 +1641,13 @@ func (out *testStdout) Write(data []byte) (int, error) {
defer buf.mu.Unlock() defer buf.mu.Unlock()
// Append the output. // Append the output.
var prev []byte if len(buf.output) == 0 || buf.output[len(buf.output)-1].stderr {
if len(buf.output) > 0 && !buf.output[len(buf.output)-1].stderr { buf.output = append(buf.output, outputEntry{
prev = buf.output[len(buf.output)-1].data stderr: false,
buf.output = buf.output[:len(buf.output)-1] })
} }
buf.output = append(buf.output, outputEntry{ last := &buf.output[len(buf.output)-1]
stderr: false, last.data = append(last.data, data...)
data: append(prev, data...),
})
return len(data), nil return len(data), nil
} }
@@ -1674,15 +1672,13 @@ func (out *testStderr) Write(data []byte) (int, error) {
defer buf.mu.Unlock() defer buf.mu.Unlock()
// Append the output. // Append the output.
var prev []byte if len(buf.output) == 0 || !buf.output[len(buf.output)-1].stderr {
if len(buf.output) > 0 && buf.output[len(buf.output)-1].stderr { buf.output = append(buf.output, outputEntry{
prev = buf.output[len(buf.output)-1].data stderr: true,
buf.output = buf.output[:len(buf.output)-1] })
} }
buf.output = append(buf.output, outputEntry{ last := &buf.output[len(buf.output)-1]
stderr: true, last.data = append(last.data, data...)
data: append(prev, data...),
})
return len(data), nil return len(data), nil
} }