test: print command string

When debugging it's useful to get the exact command line which is used.
This string can then be directly given to 'gdb --args'.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/test/config/config-diff.sh

@@ -40,9 +40,23 @@ fi
 
 output="${build_dir}"/$(basename "${expected_output}")
 
-LIBNVME_SYSFS_PATH="${sysfs_path}" \
-LIBNVME_HOSTNQN=nqn.2014-08.org.nvmexpress:uuid:ce4fee3e-c02c-11ee-8442-830d068a36c6 \
-LIBNVME_HOSTID=ce4fee3e-c02c-11ee-8442-830d068a36c6 \
-"${test_binary}" "${config_json}" > "${output}" || echo "test failed"
+cmd=(
+  env
+  LIBNVME_SYSFS_PATH="$sysfs_path"
+  LIBNVME_HOSTNQN="nqn.2014-08.org.nvmexpress:uuid:ce4fee3e-c02c-11ee-8442-830d068a36c6"
+  LIBNVME_HOSTID="ce4fee3e-c02c-11ee-8442-830d068a36c6"
+  "$test_binary"
+  "$config_json"
+)
+
+echo "Running command:"
+printf '%q ' "${cmd[@]}"
+printf '> %q\n' "$output"
+
+if ! "${cmd[@]}" > "$output"; then
+    rc=$?
+    echo "test failed (exit code $rc)"
+    exit $rc
+fi
 
 diff -u "${expected_output}" "${output}"

libnvme/test/sysfs/meson.build

@@ -8,7 +8,7 @@
 diff = find_program('diff', required : false)
 if diff.found()
     tree_dump = executable(
-        'libnvme - test-tree-dump',
+        'test-tree-dump',
         ['tree-dump.c'],
         dependencies: libnvme_dep,
     )

libnvme/test/sysfs/tree-diff.sh

@@ -14,9 +14,22 @@ rm -rf "${TEST_DIR}"
 mkdir "${TEST_DIR}"
 tar -x -f "${SYSFS_INPUT}" -C "${TEST_DIR}"
 
-LIBNVME_SYSFS_PATH="${TEST_DIR}" \
-LIBNVME_HOSTNQN=nqn.2014-08.org.nvmexpress:uuid:ce4fee3e-c02c-11ee-8442-830d068a36c6 \
-LIBNVME_HOSTID=ce4fee3e-c02c-11ee-8442-830d068a36c6 \
-"${TREE_DUMP}" > "${ACTUAL_OUTPUT}" || echo "test failed"
+cmd=(
+  env
+  LIBNVME_SYSFS_PATH="$TEST_DIR"
+  LIBNVME_HOSTNQN="nqn.2014-08.org.nvmexpress:uuid:ce4fee3e-c02c-11ee-8442-830d068a36c6"
+  LIBNVME_HOSTID="ce4fee3e-c02c-11ee-8442-830d068a36c6"
+  "$TREE_DUMP"
+)
+
+echo "Running command:"
+printf '%q ' "${cmd[@]}"
+printf '> %q\n' "$ACTUAL_OUTPUT"
+
+if ! "${cmd[@]}" > "$ACTUAL_OUTPUT"; then
+    rc=$?
+    echo "test failed (exit code $rc)"
+    exit $rc
+fi
 
 diff -u "${EXPECTED_OUTPUT}" "${ACTUAL_OUTPUT}"