Use absolute paths for . common

Otherwise it can pick up other common in PATH first...

Author: cirosantilli

bench-all

@@ -2,7 +2,7 @@
 # Run all benchmarks for this repo, and save the results to the
 # benchmark repo, which should be cloned at ../linux-kernel-module-cheat-benchmarks.
 set -eux
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 
 bench_build=false
 bench_buildroot_baseline=false

bench-boot

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 caches='--caches --l2cache --l1d_size=1024kB --l1i_size=1024kB --l2_size=1024kB --l3_size=1024kB'
 bench() (
   common_bench_cmd "./run -a ${1}" "$common_bench_boot"

build

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 set -- ${cli_build:-} "$@"
 mkdir -p "${out_dir}"
 br2_cli_file="${out_dir}/br2_cli"

gem5-bench-cache

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 generate_checkpoints=true
 while getopts a:C OPT; do
   case "$OPT" in

gem5-shell

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 while getopts M:n: OPT; do
   case "$OPT" in
     M)

gem5-stat

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 while getopts a:hs: OPT; do
   case "$OPT" in
     a)

qemu-trace2txt

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 set -- ${cli_qemu_trace2txt:-} "$@"
 while getopts a: OPT; do
   case "$OPT" in

run

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 set -- ${cli_run:-} "$@"
 
 # CLI handling.
@@ -364,7 +364,7 @@ if "$tmux"; then
   fi
 fi
 cmd="time ${cmd}"
-if ! "$debug_vm"; then
+if [ -z "$debug_vm" ]; then
   cmd="${cmd} \
 |& tee >(ts -s %.s > ${common_termout_file}) \
 "

rungdb

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 set -- ${cli_rungdb:-} "$@"
 after=
 before=

rungdb-user

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-. common
+. "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common"
 set -- ${cli_rungdb_user:-} "$@"
 usage="$0 <exec-relative-path> [<brk-symbol>]"
 gem5_opt=