From 4ecaad6ef176e3731740160e48901e6b1ecc5cb0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 26 Sep 2023 13:04:33 +0200
Subject: [PATCH] chore(linux): Address code review comments

---
 linux/ibus-keyman/tests/scripts/run-single-test.sh | 2 +-
 linux/ibus-keyman/tests/scripts/test-helper.inc.sh | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/linux/ibus-keyman/tests/scripts/run-single-test.sh b/linux/ibus-keyman/tests/scripts/run-single-test.sh
index 18c30dc30c3..e2b17f755f4 100755
--- a/linux/ibus-keyman/tests/scripts/run-single-test.sh
+++ b/linux/ibus-keyman/tests/scripts/run-single-test.sh
@@ -21,7 +21,7 @@ fi
 
 function help() {
   echo "Usage:"
-  echo "  $0 [--env <envfile>] [-k] [--tap] [--surrounding-text] [--no-surrounding-text] [--wayland|--x11] [--] TEST"
+  echo "  $0 [--env <envfile>] [-k] [--tap] [--surrounding-text] [--no-surrounding-text] [--wayland|--x11] [--check <pidfile> --cleanup <file>] [--] TEST"
   echo
   echo "Arguments:"
   echo "  --help, -h, -?          Display this help"
diff --git a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
index 292e5c8f2b3..5d34a1ab487 100755
--- a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
+++ b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
@@ -203,9 +203,8 @@ function _setup_display_server() {
 }
 
 function _setup_schema_and_gsettings() {
-  local ENV_FILE CLEANUP_FILE
+  local ENV_FILE
   ENV_FILE=$1
-  CLEANUP_FILE=$2
 
   # Install schema to temporary directory. This removes the build dependency on the keyman package.
   SCHEMA_DIR=$TEMP_DATA_DIR/glib-2.0/schemas
@@ -275,7 +274,7 @@ function setup() {
 
   _setup_test_dbus_server "${ENV_FILE}" "${CLEANUP_FILE}"
   _setup_display_server "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}" "${DISPLAY_SERVER}"
-  _setup_schema_and_gsettings "${ENV_FILE}" "${CLEANUP_FILE}"
+  _setup_schema_and_gsettings "${ENV_FILE}"
   _setup_ibus "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}"
 }
 
@@ -288,7 +287,7 @@ function setup_display_server_only() {
 
   _setup_init "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}"
   _setup_display_server "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}" "${DISPLAY_SERVER}"
-  _setup_schema_and_gsettings "${ENV_FILE}" "${CLEANUP_FILE}"
+  _setup_schema_and_gsettings "${ENV_FILE}"
 }
 
 function cleanup() {