Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
00db1b55
Unverified
Commit
00db1b55
authored
Dec 08, 2020
by
Yossi Gottlieb
Committed by
GitHub
Dec 08, 2020
Browse files
Fix failing macOS tests due to wc differences. (#8161)
parent
37f45d9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/support/util.tcl
View file @
00db1b55
...
...
@@ -109,7 +109,7 @@ proc wait_done_loading r {
# count current log lines in server's stdout
proc count_log_lines
{
srv_idx
}
{
set _
[
exec wc -l <
[
srv $srv_idx stdout
]]
set _
[
string trim
[
exec wc -l <
[
srv $srv_idx stdout
]]
]
}
# returns the number of times a line with that pattern appears in a file
...
...
@@ -117,7 +117,7 @@ proc count_message_lines {file pattern} {
set res 0
# exec fails when grep exists with status other than 0
(
when the patter wasn't found
)
catch
{
set res
[
exec grep $pattern $file 2> /dev/null | wc -l
]
set res
[
string trim
[
exec grep $pattern $file 2> /dev/null | wc -l
]
]
}
return $res
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment