ChillerDragon/teeworlds_network
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix client integration tests

Browse source
This commit is contained in:
ChillerDragon 2024-01-22 23:26:05 +08:00
parent ffcb8c7083
commit 55549eaa60
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
integration_test/run.sh
View file

@ -21,14 +21,14 @@ mkdir -p tmp
function start_tw_server() { function start_tw_server() {
if [[ -x "$(command -v teeworlds_srv)" ]] if [[ -x "$(command -v teeworlds_srv)" ]]
then then
teeworlds_srv "$srvcfg" &> "$logdir/server.txt" & teeworlds_srv "$srvcfg" &> "$logdir/server.txt"
elif [[ -x "$(command -v teeworlds-server)" ]] elif [[ -x "$(command -v teeworlds-server)" ]]
then then
teeworlds-server "$srvcfg" &> "$logdir/server.txt" & teeworlds-server "$srvcfg" &> "$logdir/server.txt"
tw_srv_bin='teeworlds-server' tw_srv_bin='teeworlds-server'
elif [[ -x "$(command -v teeworlds-srv)" ]] elif [[ -x "$(command -v teeworlds-srv)" ]]
then then
teeworlds-srv "$srvcfg" &> "$logdir/server.txt" & teeworlds-srv "$srvcfg" &> "$logdir/server.txt"
tw_srv_bin='teeworlds-srv' tw_srv_bin='teeworlds-srv'
else else
echo "Error: please install a teeworlds_srv" echo "Error: please install a teeworlds_srv"
@ -172,7 +172,8 @@ if [[ "$testname" =~ ^client/ ]]
then then
echo "ruby client log $(date)" > "$ruby_logfile" echo "ruby client log $(date)" > "$ruby_logfile"
echo "server log $(date)" > "$logdir/server.txt" echo "server log $(date)" > "$logdir/server.txt"
start_tw_server start_tw_server &
_kill_pids+=($!)
else else
echo "ddnet7 client log $(date)" > "$logdir/client.txt" echo "ddnet7 client log $(date)" > "$logdir/client.txt"
echo "ruby server log $(date)" > "$ruby_logfile" echo "ruby server log $(date)" > "$ruby_logfile"
@ -183,8 +184,14 @@ function run_ruby_test() {
fail "test $testname finished with non zero exit code" fail "test $testname finished with non zero exit code"
fi fi
} }
run_ruby_test & if [[ "$testname" =~ ^server/ ]]
_kill_pids+=($!) then
run_ruby_test &
_kill_pids+=($!)
else
run_ruby_test
kill_all_jobs
fi
if [[ "$testname" =~ ^server/ ]] if [[ "$testname" =~ ^server/ ]]
then then