The following commit has been merged into the core/rcu branch of tip: Commit-ID: 03edf700db335b9375c18310d59d0a0ab6c850df Gitweb: https://git.kernel.org/tip/03edf700db335b9375c18310d59d0a0ab6c850df Author: Paul E. McKenney <paulmck@xxxxxxxxxx> AuthorDate: Tue, 23 Feb 2021 13:12:41 -08:00 Committer: Paul E. McKenney <paulmck@xxxxxxxxxx> CommitterDate: Mon, 22 Mar 2021 08:29:20 -07:00 torture: Print proper vmlinux path for kvm-again.sh runs The kvm-again.sh script does not copy over the vmlinux files due to their large size. This means that a gdb run must use the vmlinux file from the original "res" directory. This commit therefore finds that directory and prints it out so that the user can copy and pasted the gdb command just as for the initial run. Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> --- tools/testing/selftests/rcutorture/bin/kvm-again.sh | 5 ++++- tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/kvm-again.sh b/tools/testing/selftests/rcutorture/bin/kvm-again.sh index f1c80b0..668636e 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-again.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-again.sh @@ -159,7 +159,10 @@ do then echo "# seconds=$dur" >> $i fi - echo "# TORTURE_KCONFIG_GDB_ARG=''" >> $i + if test -n "$arg_remote" + then + echo "# TORTURE_KCONFIG_GDB_ARG=''" >> $i + fi done # Extract settings from the last qemu-cmd file transformed above. diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh index 576a9b7..5b1aa2a 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh @@ -67,7 +67,11 @@ then base_resdir=`echo $resdir | sed -e 's/\.[0-9]\+$//'` if ! test -f $base_resdir/vmlinux then - base_resdir=/path/to + base_resdir="`cat re-run`/$resdir" + if ! test -f $base_resdir/vmlinux + then + base_resdir=/path/to + fi fi echo Waiting for you to attach a debug session, for example: > /dev/tty echo " gdb $base_resdir/vmlinux" > /dev/tty
|