[tests/fonts] rhel9: validate_family: update to use common functions

[tests/fonts] rhel9: validate_family: update to use common functions

[Akira TAGOH]

A new commit has been pushed.

Repo   : tests/fonts
Branch : rhel9
Commit : 5b790ba2c1e6b50518153315bd5fee9e86d84392
Author : Akira TAGOH <akira@tagoh.org>
Date   : 2025-11-25T12:19:54+09:00
Stats  : +9/-13 in 1 file(s)
URL    : https://src.fedoraproject.org/tests/fonts/c/5b790ba2c1e6b50518153315bd5fee9e86d84392?branch=rhel9

Log:
validate_family: update to use common functions

---
diff --git a/tests/validate_family/test.sh b/tests/validate_family/test.sh
index 9eb8a3b..155406f 100755
--- a/tests/validate_family/test.sh
+++ b/tests/validate_family/test.sh
@@ -3,6 +3,7 @@
 # vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
 
 . /usr/share/beakerlib/beakerlib.sh || exit 1
+. ../functions
 
 PACKAGE=${PACKAGE:-"blahblah-fonts"}
 FONT_FAMILY=${FONT_FAMILY:-"family anme"}
@@ -38,10 +39,11 @@ function test_pkg {
 }
 
 function test_validate_family {
-    local pkg=${1:-"unknown package"}
-    local fcfamily=${2:-"unknown family"}
-    local fcexpat=${3:-}
-    local indexes=${4:-}
+    local elems=("$@")
+    local pkg=${elems[0]:-"unknown package"}
+    local fcfamily=${elems[1]:-"unknown family"}
+    local fcexpat=${elems[2]:-}
+    local indexes=${elems[3]:-}
 
     test_pkg "$pkg"
 
@@ -92,17 +94,11 @@ rlJournalStart
     if [ -n "$VARLIST" ] && [ ! -f "$TMT_TREE/plans/$VARLIST" ]; then
         rlLogWarning "No $VARLIST in VARLIST envvar at \$TMT_TREE/plans"
     fi
+    args=("PACKAGE" "FONT_FAMILY" "FONT_VALIDATE_EXCLUDE_FILES" "FONT_VALIDATE_INDEXES")
     if [ -n "$VARLIST" ] && [ -f "$TMT_TREE/plans/$VARLIST" ]; then
-        rlLogInfo "Reading variables from $VARLIST"
-        grep -E -v "^#" "$TMT_TREE/plans/$VARLIST" | while IFS=";" read -r _PACKAGE FONT_ALIAS FONT_LANG FONT_WIDTH _FONT_FAMILY SANS SERIF MONO EMOJI MATH FONT_LANG_EXCLUDE_FILES _FONT_VALIDATE_EXCLUDE_FILES _FONT_CONF_EXCLUDE_FILES _FONT_VALIDATE_INDEXES FONT_LANG_INDEXES dummy; do
-            rlLogInfo "  PACKAGE: $_PACKAGE"
-            rlLogInfo "  FONT_FAMILY: $_FONT_FAMILY"
-            rlLogInfo "  FONT_VALIDATE_EXCLUDE_FILES: $_FONT_VALIDATE_EXCLUDE_FILES"
-            rlLogInfo "  FONT_VALIDATE_INDEXES: $_FONT_VALIDATE_INDEXES"
-            test_validate_family "$_PACKAGE" "$_FONT_FAMILY" "$_FONT_VALIDATE_EXCLUDE_FILES" "$_FONT_VALIDATE_INDEXES"
-        done
+        read_varlist "$TMT_TREE/plans/$VARLIST" "test_validate_family" "${args[@]}"
     else
-        test_validate_family "$PACKAGE" "$FONT_FAMILY" "$FONT_VALIDATE_EXCLUDE_FILES" "$FONT_VALIDATE_INDEXES"
+        call_test "test_validate_family" "${args[@]}"
     fi
 
     rlPhaseStartCleanup