caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yossi Gottlieb 2020-12-08 16:22:16 +02:00 committed by GitHub
parent 37f45d9e56
commit 00db1b5579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/support/util.tcl
View File

@ -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} {
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
} }