Skip to content

Commit

Permalink
Debug sdl2 in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChillerDragon
ChillerDragon committed Jan 23, 2024
1 parent 55549ea commit 09c81be
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 32 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ jobs:
- name: Prepare
run: |
sudo apt-get update -y
sudo apt-get install -y shellcheck teeworlds-server
sudo apt-get install -y shellcheck teeworlds-server teeworlds-data ddnet
sudo apt install -y build-essential glslang-tools libavcodec-extra libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libcurl4-openssl-dev libfreetype6-dev libglew-dev libnotify-dev libogg-dev libopus-dev libopusfile-dev libpng-dev libsdl2-dev libsqlite3-dev libssl-dev libvulkan-dev libwavpack-dev libx264-dev
gem install bundler
gem install rubocop:1.31.2
bundle install --jobs 4 --retry 3
Expand All @@ -32,11 +33,11 @@ jobs:
unzip DDNet-headless.zip
sudo mv DDNet-headless /usr/local/bin
rm DDNet-headless.zip
wget https://github.com/ChillerDragon/ddnet/releases/download/v17.4.2-headless-0.7/DDNet7-headless.zip
unzip DDNet7-headless.zip
wget https://github.com/ChillerDragon/ddnet/releases/download/v17.4.2-headless-0.7/DDNet7-headless-linux.zip
unzip DDNet7-headless-linux.zip
chmod +x DDNet7-headless
sudo mv DDNet7-headless /usr/local/bin
rm DDNet7-headless.zip
rm DDNet7-headless-linux.zip
- name: '[CLIENT] Test sending chat messages'
run: |
./integration_test/run.sh client/chat.rb
Expand Down
99 changes: 71 additions & 28 deletions integration_test/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ kill_marker=kill_me_d5af0410
server_port=8377
srvcfg="sv_rcon_password rcon;sv_port $server_port;$kill_marker"
cl_fifo="$PWD/$tmpdir/client.fifo"
clcfg="cl_input_fifo $cl_fifo;connect 127.0.0.1:$server_port;$kill_marker"
clcfg="cl_input_fifo $cl_fifo;connect 127.0.0.1:$server_port;player_name test_client;$kill_marker"
tw_srv_running=0
ruby_logfile=ruby_client.txt

_client_pid=''
_kill_pids=()

mkdir -p logs
mkdir -p tmp

function start_tw_server() {
start_tw_server() {
if [[ -x "$(command -v teeworlds_srv)" ]]
then
teeworlds_srv "$srvcfg" &> "$logdir/server.txt"
Expand All @@ -37,7 +38,7 @@ function start_tw_server() {
tw_srv_running=1
}

function connect_tw_client() {
connect_tw_client() {
if [[ -x "$(command -v teeworlds-headless)" ]]
then
teeworlds-headless "$clcfg"
Expand All @@ -53,7 +54,7 @@ function connect_tw_client() {
fi
}

function connect_ddnet7_client() {
connect_ddnet7_client() {
local clcfg_dd7
clcfg_dd7="$(echo "$clcfg" | sed 's/127.0.0.1/tw-0.7+udp:\/\/127.0.0.1/')"
if [[ -x "$(command -v DDNet7-headless)" ]]
Expand All @@ -68,10 +69,10 @@ function connect_ddnet7_client() {
fi
}

function get_test_names() {
get_test_names() {
(find client -name "*.rb";find server -name "*.rb") | tr '\n' ' '
}
function invalid_test() {
invalid_test() {
local name="$1"
echo "Error: invalid test name '$name'"
echo " valid tests: $(get_test_names)"
Expand Down Expand Up @@ -99,7 +100,7 @@ else
ruby_logfile="$logdir/ruby_server.txt"
fi

function kill_all_jobs() {
kill_all_jobs() {
local i
local kill_pid
for i in "${!_kill_pids[@]}"
Expand All @@ -114,7 +115,7 @@ function kill_all_jobs() {
pkill -f "$kill_marker"
}

function cleanup() {
cleanup() {
if [ "$tw_srv_running" == "1" ]
then
echo "[*] shutting down server ..."
Expand All @@ -127,7 +128,7 @@ function cleanup() {

trap cleanup EXIT

function fail() {
fail() {
local msg="$1"
if [ ! -f "$tmpdir/fail.txt" ]
then
Expand All @@ -142,27 +143,27 @@ function fail() {
if [[ "$testname" =~ ^client/ ]]
then
echo "[-] end of ruby client log:"
tail "$ruby_logfile"
tail -n 30 "$ruby_logfile"
echo "[-] end of server log:"
tail "$logdir/server.txt"
else
echo "[-] end of ruby server log:"
tail "$ruby_logfile"
tail -n 30 "$ruby_logfile"
echo "[-] end of client log:"
tail "$logdir/client.txt"
fi
fi
echo "$msg"
echo "[-][FATAL] $msg"
exit 1
}

function timeout() {
timeout() {
local seconds="$1"
sleep "$seconds"
echo "[-] Timeout -> killing: $testname"
touch "$tmpdir/timeout.txt"
kill_all_jobs
fail "[-] Timeout"
fail "Timeout"
}

echo "[*] running test '$testname' ..."
Expand All @@ -178,7 +179,7 @@ else
echo "ddnet7 client log $(date)" > "$logdir/client.txt"
echo "ruby server log $(date)" > "$ruby_logfile"
fi
function run_ruby_test() {
run_ruby_test() {
if ! ruby "$testname" "$kill_marker" &> "$ruby_logfile"
then
fail "test $testname finished with non zero exit code"
Expand All @@ -196,73 +197,110 @@ fi
if [[ "$testname" =~ ^server/ ]]
then
connect_ddnet7_client "$kill_marker" &>> "$logdir/client.txt" &
_kill_pids+=($!)
_client_pid=$!
_kill_pids+=("$_client_pid")
sleep 1
fi
timeout 6 "$kill_marker" &
timeout 20 "$kill_marker" &
_timeout_pid=$!

function fifo() {
fifo() {
local cmd="$1"
local fifo_file="$2"
echo "[*] $cmd >> $fifo_file"
echo "$cmd" >> "$fifo_file"
}
assert_in_log() {
# usage: assert_in_log string path [num_matches"
# examples:
# assert_in_log "string to find" "/path/to/log.txt"
# assert_in_log "string to find" "/path/to/log.txt" 2
local needle="$1"
local logfile_path="$2"
local num_matches="$3"
if ! grep -q "$needle" "$logfile_path"
then
echo "[-] Error: did not find expected string in logs"
echo "[-]"
echo "[-] expected: $needle"
echo "[-] in file: $ruby_logfile"
echo "[-]"
fail "assert failed"
fi
if [ "$num_matches" != "" ]
then
local actual_matches
actual_matches="$(grep -c "$needle" "$logfile_path")"
if [ "$actual_matches" != "$num_matches" ]
then
echo "[-] Error: found string unexpected amount of times in log file"
echo "[-]"
echo "[-] expected: $needle"
echo "[-] in file: $ruby_logfile"
echo "[-]"
echo "[-] expected num hits: $num_matches"
echo "[-] got num hits: $actual_matches"
echo "[-]"
fail "assert failed"
fi
fi
echo "[*] $needle .. OK"
}

if [ "$testname" == "client/chat.rb" ]
then
if ! grep -q 'hello world' "$logdir/server.txt"
then
fail "Error: did not find chat message in server log"
fail "did not find chat message in server log"
fi
elif [ "$testname" == "client/reconnect.rb" ]
then
if ! grep -q 'bar' "$logdir/server.txt"
then
fail "Error: did not find 2nd chat message in server log"
fail "did not find 2nd chat message in server log"
fi
elif [ "$testname" == "client/rcon.rb" ]
then
sleep 1
if pgrep -f "$tw_srv_bin $srvcfg"
then
fail "Error: server still running rcon shutdown failed"
fail "server still running rcon shutdown failed"
fi
elif [ "$testname" == "client/srv_say.rb" ]
then
if ! grep -q '^\[chat\].*hello' "$logdir/ruby_client.txt"
then
fail "Error: missing 'hello' chat message in client log"
fail "missing 'hello' chat message in client log"
fi
elif [ "$testname" == "client/multiple_blocks.rb" ]
then
sleep 1
if pgrep -f "$tw_srv_bin $srvcfg"
then
fail "Error: server still running rcon shutdown failed (2 blocks)"
fail "server still running rcon shutdown failed (2 blocks)"
fi
block1_ln="$(grep -n "block 1" "$ruby_logfile" | cut -d':' -f1)"
block2_ln="$(grep -n "block 2" "$ruby_logfile" | cut -d':' -f1)"
if [ "$block1_ln" == "" ]
then
fail "Error: 'block 1' not found in client log"
fail "'block 1' not found in client log"
fi
if [ "$block2_ln" == "" ]
then
fail "Error: 'block 2' not found in client log"
fail "'block 2' not found in client log"
fi
if [[ ! "$block1_ln" =~ ^[0-9]+$ ]]
then
fail "Error: failed to parse line number of 'block 1' got='$block1_ln'"
fail "failed to parse line number of 'block 1' got='$block1_ln'"
fi
if [[ ! "$block2_ln" =~ ^[0-9]+$ ]]
then
fail "Error: failed to parse line number of 'block 2' got='$block2_ln'"
fail "failed to parse line number of 'block 2' got='$block2_ln'"
fi
# ensure block call order matches definition order
if [ "$block1_ln" -gt "$block2_ln" ]
then
fail "Error: 'block 1' found after 'block 2' in client log"
fail "'block 1' found after 'block 2' in client log"
fi
elif [ "$testname" == "server/connect.rb" ]
then
Expand All @@ -271,6 +309,11 @@ then
fifo "rcon shutdown" "$cl_fifo"
sleep 1
fifo "quit" "$cl_fifo"
# ddnet quitting can get stuck so send a kill to ensure it dies
kill "$_client_pid"

assert_in_log "'test_client' joined the game" "$ruby_logfile" 1
assert_in_log "rcon='shutdown'" "$ruby_logfile" 1
else
echo "Error: unkown test '$testname'"
exit 1
Expand Down

0 comments on commit 09c81be

Please sign in to comment.