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

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

[Akira TAGOH]

A new commit has been pushed.

Repo   : tests/fonts
Branch : rhel9
Commit : e8f934fe6a83357ab9f955c82198e7c550504a8a
Author : Akira TAGOH <akira@tagoh.org>
Date   : 2025-11-25T11:52:45+09:00
Stats  : +18/-19 in 1 file(s)
URL    : https://src.fedoraproject.org/tests/fonts/c/e8f934fe6a83357ab9f955c82198e7c550504a8a?branch=rhel9

Log:
generic_alias: update to use common functions

---
diff --git a/tests/generic_alias/test.sh b/tests/generic_alias/test.sh
index f94c312..2480564 100755
--- a/tests/generic_alias/test.sh
+++ b/tests/generic_alias/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
 
 FONT_ALIAS=${FONT_ALIAS:-"sans-serif"}
 FONT_FAMILY=${FONT_FAMILY:-"family name"}
@@ -55,12 +56,13 @@ function test_pkg {
 }
 
 function test_generic_alias {
-    local pkg=${1:-"unknown package"}
-    local fcfamily=${2:-"undefined family"}
-    local fclang=${3:-"en"}
-    local fcwidth=${4:-"normal"}
-    local fcresult=${5:-"unknown family"}
-    local fcexpat=${6:-}
+    local elems=("$@")
+    local pkg=${elems[0]:-"unknown package"}
+    local fcfamily=${elems[1]:-"undefined family"}
+    local fclang=${elems[2]:-"en"}
+    local fcwidth=${elems[3]:-"normal"}
+    local fcresult=${elems[4]:-"unknown family"}
+    local fcexpat=${elems[5]:-}
 
     rlPhaseStartTest "Generic alias test for $pkg"
     {
@@ -81,6 +83,13 @@ function test_generic_alias {
     rlPhaseEnd
 }
 
+function test() {
+    local elems=("$@")
+
+    test_pkg "${elems[0]}"
+    test_generic_alias "${elems[@]}"
+}
+
 rlJournalStart
 {
     rlPhaseStartSetup
@@ -97,21 +106,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_ALIAS" "FONT_LANG" "FONT_WIDTH" "FONT_FAMILY" "FONT_CONF_EXCLUDE_FILES")
     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_ALIAS: $_FONT_ALIAS"
-            rlLogInfo "  FONT_LANG: $_FONT_LANG"
-            rlLogInfo "  FONT_WIDTH: $_FONT_WIDTH"
-            rlLogInfo "  FONT_FAMILY: $_FONT_FAMILY"
-            rlLogInfo "  FONT_CONF_EXCLUDE_FILES: $_FONT_EXCLUDE_FILES"
-            test_pkg "$_PACKAGE"
-            test_generic_alias "$_PACKAGE" "$_FONT_ALIAS" "$_FONT_LANG" "$_FONT_WIDTH" "$_FONT_FAMILY" "$_FONT_CONF_EXCLUDE_FILES"
-        done
+        read_varlist "$TMT_TREE/plans/$VARLIST" "test" "${args[@]}"
     else
-        test_pkg "$PACKAGE"
-        test_generic_alias "$PACKAGE" "$FONT_ALIAS" "$FONT_LANG" "$FONT_WIDTH" "$FONT_FAMILY" "$FONT_CONF_EXCLUDE_FILES"
+        call_test "test" "${args[@]}"
     fi
 
     rlPhaseStartCleanup