selftests: ublk: use tmpdir for scratch files and improve relative paths use

[blktests-ci]

Pull request for series with
subject: selftests: ublk: use tmpdir for scratch files and improve relative paths use
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1046223

[blktests-ci]

Upstream branch: 6208587
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: d91a46d
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: fcb70a5
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: 8dfce89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: de0674d
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: f14faaf
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: b7ff715
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: e7aa572
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: 05f7e89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

[blktests-ci]

Upstream branch: c22e26b
series: https://patchwork.kernel.org/project/linux-block/list/?series=1046223
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1046223
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: selftests: ublk: use tmpdir for scratch files and improve relative paths use
Using index info to reconstruct a base tree...
M	tools/testing/selftests/ublk/test_common.sh
A	tools/testing/selftests/ublk/test_generic_01.sh
M	tools/testing/selftests/ublk/test_generic_02.sh
M	tools/testing/selftests/ublk/test_generic_12.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/ublk/test_generic_12.sh
Auto-merging tools/testing/selftests/ublk/test_generic_02.sh
CONFLICT (modify/delete): tools/testing/selftests/ublk/test_generic_01.sh deleted in HEAD and modified in selftests: ublk: use tmpdir for scratch files and improve relative paths use. Version selftests: ublk: use tmpdir for scratch files and improve relative paths use of tools/testing/selftests/ublk/test_generic_01.sh left in tree.
Auto-merging tools/testing/selftests/ublk/test_common.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/ublk/test_common.sh
Patch failed at 0001 selftests: ublk: use tmpdir for scratch files and improve relative paths use'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc tools/testing/selftests/ublk/test_common.sh
index 163a40007910,ab1ea5cc904a..000000000000
--- a/tools/testing/selftests/ublk/test_common.sh
+++ b/tools/testing/selftests/ublk/test_common.sh
@@@ -58,7 -43,7 +58,11 @@@ _create_backfile() 
  	old_file="${UBLK_BACKFILES[$index]}"
  	[ -f "$old_file" ] && rm -f "$old_file"
  
++<<<<<<< HEAD
 +	new_file=$(mktemp ${UBLK_TEST_DIR}/ublk_file_"${new_size}"_XXXXX)
++=======
+ 	new_file=$(mktemp $TMPDIR/ublk_file_"${new_size}"_XXXXX)
++>>>>>>> selftests: ublk: use tmpdir for scratch files and improve relative paths use
  	truncate -s "${new_size}" "${new_file}"
  	UBLK_BACKFILES["$index"]="$new_file"
  }
@@@ -129,12 -120,8 +134,16 @@@ _prep_test() 
  	local type=$1
  	shift 1
  	modprobe ublk_drv > /dev/null 2>&1
++<<<<<<< HEAD
 +	local base_dir=${TMPDIR:-./ublktest-dir}
 +	mkdir -p "$base_dir"
 +	UBLK_TEST_DIR=$(mktemp -d ${base_dir}/${TID}.XXXXXX)
 +	UBLK_TMP=$(mktemp ${UBLK_TEST_DIR}/ublk_test_XXXXX)
++=======
+ 	UBLK_TMP=$(mktemp $TMPDIR/ublk_test_XXXXX)
++>>>>>>> selftests: ublk: use tmpdir for scratch files and improve relative paths use
  	[ "$UBLK_TEST_QUIET" -eq 0 ] && echo "ublk $type: $*"
 +	echo "ublk selftest: $TID starting at $(date '+%F %T')" | tee /dev/kmsg
  }
  
  _remove_test_files()
* Unmerged path tools/testing/selftests/ublk/test_generic_01.sh

[blktests-ci]

At least one diff in series https://patchwork.kernel.org/project/linux-block/list/?series=1046223 irrelevant now for [{'archived': False, 'project': 241}] search patterns