Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
71a8df6a
Commit
71a8df6a
authored
Mar 02, 2017
by
Guy Benoish
Browse files
Merge branch 'unstable' of
https://github.com/antirez/redis
into unstable
parents
56c01c95
9cc83d2a
Changes
182
Show whitespace changes
Inline
Side-by-side
tests/unit/aofrw.tcl
View file @
71a8df6a
...
...
@@ -73,7 +73,7 @@ start_server {tags {"aofrw"}} {
r config set appendonly no
r exec
wait_for_condition 50 100
{
[
string match
{
*Killing*AOF*child*
}
[
exec tail -
n
5 <
[
srv 0 stdout
]]]
[
string match
{
*Killing*AOF*child*
}
[
exec tail -5 <
[
srv 0 stdout
]]]
}
else
{
fail
"Can't find 'Killing AOF child' into recent logs"
}
...
...
tests/unit/type/hash.tcl
View file @
71a8df6a
...
...
@@ -525,7 +525,7 @@ start_server {tags {"hash"}} {
# 1.23 cannot be represented correctly with 64 bit doubles, so we skip
# the test, since we are only testing pretty printing here and is not
# a bug if the program outputs things like 1.299999...
if
{
!$::valgrind
|| !
[
string match *x86_64*
[
exec uname -a
]]}
{
if
{
!$::valgrind
&&
[
string match *x86_64*
[
exec uname -a
]]}
{
test
{
Test HINCRBYFLOAT for correct float representation
(
issue #2846
)}
{
r del myhash
assert
{[
r hincrbyfloat myhash float 1.23
]
eq
{
1.23
}}
...
...
Prev
1
…
6
7
8
9
10
Next
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