tmp

Author: MartinPulec

.github/scripts/run_tests.sh

@@ -1,7 +1,27 @@
 #!/bin/sh -eu
- 
+
+# see also (taken from) .github/scripts/Linux/utils/Dockerfile.ubuntu
+ubuntu_packages="
+    libasound2t64\
+    libegl1\
+    libfontconfig1\
+    libglx-mesa0\
+    libgmp10\
+    libharfbuzz0b\
+    libopengl0\
+    libp11-kit0\
+    libx11-6\
+    openbox\
+    xvfb"
+
 case "$RUNNER_OS" in
         Linux)
+                sudo apt update
+                sudo apt -y install $ubuntu_packages
+                Xvfb :99 -screen 0 1920x1080x24 &
+                export DISPLAY=:99
+                openbox &
+
                 ug_build=UltraGrid-continuous-x86_64.AppImage
                 prepare() {
                         chmod +x "$ug_build"
@@ -33,11 +53,9 @@ prepare
 
 ## used by run_test_data.sh
 ## @param $1 args
-## @param $2 timeout (optional, default 5)
-## @param $3 opts (optional) - should_fail
+## @param $2 opts (optional) - should_fail, should_timeout
 add_test() {
         eval "test_${test_count}_args=\${1?}"
-        eval "test_${test_count}_timeout=\${2:-5}"
         eval "test_${test_count}_opts=\${3-}"
         test_count=$((test_count + 1))
 }
@@ -49,19 +67,19 @@ set +e
 i=0
 while [ $i -lt $test_count ]; do
         eval "args=\$test_${i}_args"
-        eval "timeout=\$test_${i}_timeout"
         eval "opts=\$test_${i}_opts"
 
-        timeout "$timeout" "$run" "$args"
+        timeout=5
+        timeout $timeout "$run" $args
         rc=$?
 
         if [ $rc = 124 ]; then
-                printf "UG with arguments %s timeout (limit: %d sec)!\n" \
-                        "$args" "$timeout"
-                exit 1
-        fi
-
-        if expr -- "$opts" : '.*should_fail' >/dev/null; then
+                if ! expr -- "$opts" : '.*should_timeout' >/dev/null; then
+                        printf "UG with arguments %s timeout (limit: %d sec)!\n" \
+                                "$args" "$timeout"
+                        exit 1
+                fi
+        elif expr -- "$opts" : '.*should_fail' >/dev/null; then
                 if [ $rc -eq 0 ]; then
                         printf "UG with arguments %s should have failed but\
  returned 0!\n" "$args"

.github/scripts/run_tests_data.sh

@@ -1,3 +1,4 @@
 add_test -v                                        # basic sanity test
-add_test --nonexistent-param    5     should_fail
+add_test --nonexistent-param   should_fail
+add_test "-d sdl"              should_timeout