Create a temp dir for temporary files and use it instead of placing them inside source tree. Reference files in subdirectories relative to script's source dir for bpftrace uses. While there fix a typo.
Signed-off-by: Alexander Atanasov <[email protected]> --- tools/testing/selftests/ublk/test_common.sh | 8 +++++--- tools/testing/selftests/ublk/test_generic_01.sh | 5 +++-- tools/testing/selftests/ublk/test_generic_02.sh | 5 +++-- tools/testing/selftests/ublk/test_generic_12.sh | 5 +++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/ublk/test_common.sh b/tools/testing/selftests/ublk/test_common.sh index 7ff6ce79d62c..ab1ea5cc904a 100755 --- a/tools/testing/selftests/ublk/test_common.sh +++ b/tools/testing/selftests/ublk/test_common.sh @@ -43,7 +43,7 @@ _create_backfile() { old_file="${UBLK_BACKFILES[$index]}" [ -f "$old_file" ] && rm -f "$old_file" - new_file=$(mktemp ublk_file_"${new_size}"_XXXXX) + new_file=$(mktemp $TMPDIR/ublk_file_"${new_size}"_XXXXX) truncate -s "${new_size}" "${new_file}" UBLK_BACKFILES["$index"]="$new_file" } @@ -55,6 +55,7 @@ _remove_files() { [ -f "$file" ] && rm -f "$file" done [ -f "$UBLK_TMP" ] && rm -f "$UBLK_TMP" + rm -rf "$TMPDIR" } _create_tmp_dir() { @@ -119,7 +120,7 @@ _prep_test() { local type=$1 shift 1 modprobe ublk_drv > /dev/null 2>&1 - UBLK_TMP=$(mktemp ublk_test_XXXXX) + UBLK_TMP=$(mktemp $TMPDIR/ublk_test_XXXXX) [ "$UBLK_TEST_QUIET" -eq 0 ] && echo "ublk $type: $*" } @@ -367,7 +368,7 @@ run_io_and_recover() state=$(_recover_ublk_dev -n "$dev_id" "$@") if [ "$state" != "LIVE" ]; then - echo "faile to recover to LIVE($state)" + echo "failed to recover to LIVE($state)" return 255 fi @@ -401,3 +402,4 @@ UBLK_BACKFILES=() export UBLK_PROG export UBLK_TEST_QUIET export UBLK_TEST_SHOW_RESULT +export TMPDIR=$(mktemp -d ${TMPDIR:-/tmp}/ublktest-dir.XXXXXX) diff --git a/tools/testing/selftests/ublk/test_generic_01.sh b/tools/testing/selftests/ublk/test_generic_01.sh index 21a31cd5491a..5b06beee91ca 100755 --- a/tools/testing/selftests/ublk/test_generic_01.sh +++ b/tools/testing/selftests/ublk/test_generic_01.sh @@ -1,7 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh +TDIR=$(cd "$(dirname "$0")" && pwd) +. $TDIR/test_common.sh TID="generic_01" ERR_CODE=0 @@ -20,7 +21,7 @@ dev_id=$(_add_ublk_dev -t null) _check_add_dev $TID $? dev_t=$(_get_disk_dev_t "$dev_id") -bpftrace trace/seq_io.bt "$dev_t" "W" 1 > "$UBLK_TMP" 2>&1 & +bpftrace $TDIR/trace/seq_io.bt "$dev_t" "W" 1 > "$UBLK_TMP" 2>&1 & btrace_pid=$! sleep 2 diff --git a/tools/testing/selftests/ublk/test_generic_02.sh b/tools/testing/selftests/ublk/test_generic_02.sh index 12920768b1a0..1c0e3ab8afc7 100755 --- a/tools/testing/selftests/ublk/test_generic_02.sh +++ b/tools/testing/selftests/ublk/test_generic_02.sh @@ -1,7 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh +TDIR=$(cd "$(dirname "$0")" && pwd) +. $TDIR/test_common.sh TID="generic_02" ERR_CODE=0 @@ -20,7 +21,7 @@ dev_id=$(_add_ublk_dev -t null -q 2) _check_add_dev $TID $? dev_t=$(_get_disk_dev_t "$dev_id") -bpftrace trace/seq_io.bt "$dev_t" "W" 1 > "$UBLK_TMP" 2>&1 & +bpftrace $TDIR/trace/seq_io.bt "$dev_t" "W" 1 > "$UBLK_TMP" 2>&1 & btrace_pid=$! sleep 2 diff --git a/tools/testing/selftests/ublk/test_generic_12.sh b/tools/testing/selftests/ublk/test_generic_12.sh index b4046201b4d9..d4240ec94827 100755 --- a/tools/testing/selftests/ublk/test_generic_12.sh +++ b/tools/testing/selftests/ublk/test_generic_12.sh @@ -1,7 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh +TDIR=$(cd "$(dirname "$0")" && pwd) +. $TDIR/test_common.sh TID="generic_12" ERR_CODE=0 @@ -21,7 +22,7 @@ dev_id=$(_add_ublk_dev -t null -q 4 -d 16 --nthreads $NTHREADS --per_io_tasks) _check_add_dev $TID $? dev_t=$(_get_disk_dev_t "$dev_id") -bpftrace trace/count_ios_per_tid.bt "$dev_t" > "$UBLK_TMP" 2>&1 & +bpftrace $TDIR/trace/count_ios_per_tid.bt "$dev_t" > "$UBLK_TMP" 2>&1 & btrace_pid=$! sleep 2 -- 2.43.0
