From: Colin Clark Date: Sat, 22 Jul 2023 15:15:16 +0000 (+0100) Subject: Do not run tests on unsupported image type X-Git-Tag: v2.2~192 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=dd3d8aacb81b507167f8a8e106c9907bf9bf5802 Do not run tests on unsupported image type Ensure that image types not support by the run-time system are not tested. --- diff --git a/scripts/get-test-images.sh b/scripts/get-test-images.sh index db8700ae..12dd81b9 100755 --- a/scripts/get-test-images.sh +++ b/scripts/get-test-images.sh @@ -26,6 +26,23 @@ ## $2 git test image repo. \n ## +# GitHub workflow actions run on Ubuntu 22.04 (at the time of writing) +# Some libraries are not available in that version, so do not run +# image tests on the relevant files. +# +# 20.04 is checked for so that if a development system is running 23.x +# but all required libraries are not installed, an error will be flagged. +version=$(lsb_release -d) +if echo "$version" | grep -q "Ubuntu 22.04" > /dev/null +then + exceptions=" + jxl + libjxl-dev + " +else + exceptions="" +fi + if [ ! -d "$1" ] then mkdir -p "$1" @@ -38,7 +55,36 @@ fi for file in "$1/images/"* do - echo "$file" + library_installed=true + i=0 + + for exception_string in $exceptions + do + if [ $((i % 2)) -eq 0 ] + then + file_extension="$exception_string" + else + library_file="$exception_string" + basefile_name=$(basename "$file") + basefile_match=$(basename "$basefile_name" "$file_extension") + + if [ ! "$basefile_name" = "$basefile_match" ] + then + if ! dpkg-query --show --showformat='${Status}' "$library_file" > /dev/null 2>&1 + then + library_installed=false + break + fi + fi + fi + + i=$((i + 1)) + done + + if [ "$library_installed" = "true" ] + then + echo "$file" + fi done exit 0