test: refactor out logging for calling executables

2 files changed, 19 insertions, 6 deletions

diff --git a/test/lib/log.sh b/test/lib/log.sh
index b26e16a..34124cf 100644
--- a/test/lib/log.sh
+++ b/test/lib/log.sh
@@ -10,6 +10,17 @@ log() {
     done
 }
 
+log_run() {
+    if [ "$#" -lt 1 ]; then
+        log "usage: ${FUNCNAME[0]} ARGV0 [ARG...]"
+        return 1
+    fi
+
+    local msg='Running:'
+    msg="$msg$( printf -- ' %q' "$@" )"
+    log "$msg"
+}
+
 fail() {
     local msg
     for msg; do
diff --git a/test/lib/test.sh b/test/lib/test.sh
index bec2aec..2a1fac1 100644
--- a/test/lib/test.sh
+++ b/test/lib/test.sh
@@ -52,13 +52,15 @@ test_cleanup_default() {
 }
 
 test_run_script() {
-    local msg='Executing script:'
-    msg="$msg$( printf -- ' %q' "$@" --shared-dir "$test_src_dir" --database "$test_root_dir/links.bin" )"
-    log "$msg"
-
-    DEST="$test_dest_dir" ALT_DEST="$test_alt_dest_dir" "$@" \
-        --shared-dir "$test_src_dir" \
+    local common_args=(
+        --shared-dir "$test_src_dir"
         --database "$test_root_dir/links.bin"
+    )
+
+    log_run "$@" "${common_args[@]}"
+
+    DEST="$test_dest_dir" ALT_DEST="$test_alt_dest_dir" \
+        "$@" "${common_args[@]}"
 }
 
 test_run_update() {