Debug sdl2 in CI

Author: ChillerDragon

.github/workflows/integration.yml

@@ -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
@@ -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

integration_test/run.sh

@@ -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"
@@ -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"
@@ -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)" ]]
@@ -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)"
@@ -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[@]}"
@@ -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 ..."
@@ -127,7 +128,7 @@ function cleanup() {
 
 trap cleanup EXIT
 
-function fail() {
+fail() {
 	local msg="$1"
 	if [ ! -f "$tmpdir/fail.txt" ]
 	then
@@ -156,7 +157,7 @@ function fail() {
 	exit 1
 }
 
-function timeout() {
+timeout() {
 	local seconds="$1"
 	sleep "$seconds"
 	echo "[-] Timeout -> killing: $testname"
@@ -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"
@@ -196,18 +197,55 @@ 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
@@ -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