Unverified Commit 00db1b55 authored by Yossi Gottlieb's avatar Yossi Gottlieb Committed by GitHub
Browse files

Fix failing macOS tests due to wc differences. (#8161)

parent 37f45d9e
...@@ -109,7 +109,7 @@ proc wait_done_loading r { ...@@ -109,7 +109,7 @@ proc wait_done_loading r {
# count current log lines in server's stdout # count current log lines in server's stdout
proc count_log_lines {srv_idx} { 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 # returns the number of times a line with that pattern appears in a file
...@@ -117,7 +117,7 @@ proc count_message_lines {file pattern} { ...@@ -117,7 +117,7 @@ proc count_message_lines {file pattern} {
set res 0 set res 0
# exec fails when grep exists with status other than 0 (when the patter wasn't found) # exec fails when grep exists with status other than 0 (when the patter wasn't found)
catch { 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 return $res
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment