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
4bc4d2c7
Unverified
Commit
4bc4d2c7
authored
Apr 06, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 06, 2020
Browse files
Merge pull request #7063 from oranagra/oran-runtest-external
diffrent fix for runtest --host --port
parents
b0bbfed2
cf3789f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/support/server.tcl
View file @
4bc4d2c7
...
@@ -159,12 +159,9 @@ proc start_server {options {code undefined}} {
...
@@ -159,12 +159,9 @@ proc start_server {options {code undefined}} {
if
{
$::external
}
{
if
{
$::external
}
{
if
{[
llength $::servers
]
== 0
}
{
if
{[
llength $::servers
]
== 0
}
{
set srv
{}
set srv
{}
# In test_server_main
(
tests/test_helper.tcl:215~218
)
, increase the value of start_port
# and assign it to ::port through the `--port` option, so we need to reduce it.
set baseport
[
expr
{
$::port-100
}]
dict set srv
"host"
$::host
dict set srv
"host"
$::host
dict set srv
"port"
$
base
port
dict set srv
"port"
$
::
port
set client
[
redis $::host $
base
port 0 $::tls
]
set client
[
redis $::host $
::
port 0 $::tls
]
dict set srv
"client"
$client
dict set srv
"client"
$client
$client select 9
$client select 9
...
...
tests/test_helper.tcl
View file @
4bc4d2c7
...
@@ -212,13 +212,19 @@ proc test_server_main {} {
...
@@ -212,13 +212,19 @@ proc test_server_main {} {
# Start the client instances
# Start the client instances
set ::clients_pids
{}
set ::clients_pids
{}
set start_port
[
expr
{
$::port
+100
}]
if
{
$::external
}
{
for
{
set j 0
}
{
$j
< $::numclients
}
{
incr j
}
{
set start_port
[
find_available_port $start_port
]
set p
[
exec $tclsh
[
info script
]
{*}
$::argv
\
set p
[
exec $tclsh
[
info script
]
{*}
$::argv
\
--client $port --port $
start_
port &
]
--client $port --port $
::
port &
]
lappend ::clients_pids $p
lappend ::clients_pids $p
incr start_port 10
}
else
{
set start_port
[
expr
{
$::port
+100
}]
for
{
set j 0
}
{
$j
< $::numclients
}
{
incr j
}
{
set start_port
[
find_available_port $start_port
]
set p
[
exec $tclsh
[
info script
]
{*}
$::argv
\
--client $port --port $start_port &
]
lappend ::clients_pids $p
incr start_port 10
}
}
}
# Setup global state for the test server
# Setup global state for the test server
...
@@ -506,9 +512,6 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
...
@@ -506,9 +512,6 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
}
elseif
{
$opt
eq
{
--host
}}
{
}
elseif
{
$opt
eq
{
--host
}}
{
set ::external 1
set ::external 1
set ::host $arg
set ::host $arg
# If we use an external server, we can only set numclients to 1,
# otherwise the port will be miscalculated.
set ::numclients 1
incr j
incr j
}
elseif
{
$opt
eq
{
--port
}}
{
}
elseif
{
$opt
eq
{
--port
}}
{
set ::port $arg
set ::port $arg
...
...
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