From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 18 Jun 2023 00:30:35 +0000 (+0000)
Subject: CI: Remove pass-through test-functionality test wrappers (#1383)
X-Git-Tag: SQUID_6_4~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4853b2d16b5be9935ecf7026e4ecf3a62e0718d;p=thirdparty%2Fsquid.git

CI: Remove pass-through test-functionality test wrappers (#1383)

Instead of requiring a custom test wrapper for each test and, hence,
creating an ever-increasing number of pass-through wrappers that do
nothing useful, use a custom test wrapper if and only if it exists. By
default (i.e. when there is no custom wrapper), just run the named test.

As a positive side effect, this change also simplifies running tests
that are not on the $default_tests list hard-coded in main():

    test-suite/test-functionality.sh some-new-test-i-am-working-on
---

diff --git a/test-suite/test-functionality.sh b/test-suite/test-functionality.sh
index 6d9aa568f6..0e092c35bc 100755
--- a/test-suite/test-functionality.sh
+++ b/test-suite/test-functionality.sh
@@ -165,14 +165,6 @@ run_confirmed_test() {
     return $result
 }
 
-check_pconn() {
-    run_confirmed_test pconn
-}
-
-check_busy_restart() {
-    run_confirmed_test busy-restart
-}
-
 check_proxy_collapsed_forwarding() {
     if ! has_commit_by_message 1af789e 'Do not stall if xactions overwrite a recently active'
     then
@@ -200,19 +192,20 @@ check_upgrade_protocols() {
     run_confirmed_test upgrade-protocols
 }
 
-check_truncated_responses() {
-    run_confirmed_test truncated-responses
-}
-
-# executes a single check_name test named by the parameter
+# executes a single test named by the parameter
 run_one_test() {
     local testName=$1
 
-    # convert a test name foo into a check_foo() function name suffix; e.g.
-    # busy-restart becomes busy_restart (to be called below as check_busy_restart)
-    check=`echo $testName | sed s/-/_/g`
+    # convert the given foo-bar test name into a check_foo_bar() function name
+    checkFunction=`echo "check_$testName" | sed s/-/_/g`
 
-    check_$check
+    if type $checkFunction 1> /dev/null 2> /dev/null
+    then
+        # a custom test wrapper exists
+        $checkFunction
+    else
+        run_confirmed_test $testName
+    fi
 }
 
 # executes all of the given tests, providing a summary of their failures