From 85be87d71c4ec73a41fc9a78d0e1de3aee09a7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Sun, 14 Jul 2019 00:00:00 +0000 Subject: [PATCH] bisect: use current script directory to call other scripts --- README.adoc | 2 +- bisect-gem5-linux-boot | 7 ++++--- bisect-linux-boot-gem5 | 7 ++++--- bisect-qemu-linux-boot | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.adoc b/README.adoc index 9994ec5..bc18844 100644 --- a/README.adoc +++ b/README.adoc @@ -10119,7 +10119,7 @@ Original report: https://www.mail-archive.com/gem5-users@gem5.org/msg16677.html At d334a0db538db1a82db62fd5f74a169ca9e21f23 + 1: .... -/run --arch aarch64 --emulator gem5 --tmux --cpu 2 --run-id 2 -- --cpu-type=HPI --caches --l2cache --l1d_size=64kB --l1i_size=64kB --l2_size=256kB +./run --arch aarch64 --emulator gem5 --cpu 2 -- --cpu-type=HPI --caches --l2cache --l1d_size=64kB --l1i_size=64kB --l2_size=256kB .... The simulator fails with: diff --git a/bisect-gem5-linux-boot b/bisect-gem5-linux-boot index 2e70e5b..a46e53f 100755 --- a/bisect-gem5-linux-boot +++ b/bisect-gem5-linux-boot @@ -1,12 +1,13 @@ #!/usr/bin/env bash # https://cirosantilli.com/linux-kernel-module-cheat#bisection set -eu -cd ../.. -./build-gem5 --gem5-build-id bisect +root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +"${root_dir}/build-gem5" --arch aarch64 --gem5-build-id bisect --clean +"${root_dir}/build-gem5" --arch aarch64 --gem5-build-id bisect set +e # Setup for quick failures: # https://stackoverflow.com/questions/4713088/how-to-use-git-bisect/22592593#22592593 -timeout 5 ./run --emulator gem5 --gem5-build-id bisect --quit-after-boot +timeout 5 "${root_dir}/run" --emulator gem5 --gem5-build-id bisect --quit-after-boot "$@" if [ $? -ne 124 ]; then exit 1 fi diff --git a/bisect-linux-boot-gem5 b/bisect-linux-boot-gem5 index 2f2ef66..0b22f47 100755 --- a/bisect-linux-boot-gem5 +++ b/bisect-linux-boot-gem5 @@ -1,10 +1,11 @@ #!/usr/bin/env bash # https://cirosantilli.com/linux-kernel-module-cheat#bisection set -eu -./build-linux --clean "$@" -./build-linux "$@" +root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +"${root_dir}/build-linux" --clean "$@" +"${root_dir}/build-linux" "$@" set +e -./run --quit-after-boot "$@" || status=$? +"${root_dir}/run" --quit-after-boot "$@" || status=$? # https://stackoverflow.com/questions/4713088/how-to-use-git-bisect/22592593#22592593 if [ "$status" -eq 125 ] || [ "$status" -gt 127 ]; then status=1 diff --git a/bisect-qemu-linux-boot b/bisect-qemu-linux-boot index 290f8ae..7d245b0 100755 --- a/bisect-qemu-linux-boot +++ b/bisect-qemu-linux-boot @@ -2,6 +2,6 @@ # https://cirosantilli.com/linux-kernel-module-cheat#bisection set -eu git submodule update --recursive -cd ../.. -./build-qemu --arch aarch64 --qemu-build-id bisect -./run --arch aarch64 --qemu-build-id bisect --quit-after-boot +root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +"${root_dir}/build-qemu" --arch aarch64 --qemu-build-id bisect +"${root_dir}/run" --arch aarch64 --qemu-build-id bisect --quit-after-boot