Commit 32ae05a9 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(obtain_lock): Use $python from site.exp instead of hardcoding "python".

(client_start): Ditto.
(client_start_fail): Ditto.
parent d54ccb2e
......@@ -112,11 +112,12 @@ proc obtain_lock {} {
global lock_id
global any
global srcdir
global python
if {$lock_count == 0} {
set redo 1
while {$redo} {
spawn python $srcdir/locksuite.py
spawn $python $srcdir/locksuite.py
set lock_id $spawn_id
expect {
-re "^locking...$nl" {
......@@ -1100,8 +1101,9 @@ proc client_start {nr} {
global expect_active
global srcdir
global deep_any
global python
spawn python $srcdir/tcpconnect.py localhost $clientport MRK:client$nr
spawn $python $srcdir/tcpconnect.py localhost $clientport MRK:client$nr
set client_id($nr) $spawn_id
set expect_active($client_id($nr)) " -i $client_id($nr) -re \"($deep_any*)$nl\" { fail \"\$test (unexpected line \$expect_out(1,string))\"; exp_continue } timeout { fail \"\$test (timeout on client $nr)\" }"
set expect_always($client_id($nr)) \
......@@ -1124,10 +1126,11 @@ proc client_start_fail {nr {response ""}} {
global expect_active
global srcdir
global deep_any
global python
obtain_lock
spawn python $srcdir/tcpconnect.py localhost $clientport MRK:client$nr
spawn $python $srcdir/tcpconnect.py localhost $clientport MRK:client$nr
set client_id($nr) $spawn_id
set expect_active($client_id($nr)) " -i $client_id($nr) -re \"($deep_any*)$nl\" { fail \"\$test (unexpected line \$expect_out(1,string))\"; exp_continue } timeout { fail \"\$test (timeout on client $nr)\" }"
set expect_always($client_id($nr)) \
......
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