If perf is built into an output directory then so is
libperf-jvmti.so. If `perf test` is run from that directory then PWD
needn't also be that directory meaning libperf-jvmti.so won't be found
and the test skipped. Add an additional check for libperf-jvmti.so in
the same directory as the perf binary for this case, this avoids the
test skipping.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/tests/shell/test_java_symbol.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/tests/shell/test_java_symbol.sh b/tools/perf/tests/shell/test_java_symbol.sh
index 499539d1c479..63a2cc9bf13f 100755
--- a/tools/perf/tests/shell/test_java_symbol.sh
+++ b/tools/perf/tests/shell/test_java_symbol.sh
@@ -22,10 +22,13 @@ cleanup_files()
 
 trap cleanup_files exit term int
 
+PERF_DIR=$(dirname "$(which perf)")
 if [ -e "$PWD/tools/perf/libperf-jvmti.so" ]; then
 	LIBJVMTI=$PWD/tools/perf/libperf-jvmti.so
 elif [ -e "$PWD/libperf-jvmti.so" ]; then
 	LIBJVMTI=$PWD/libperf-jvmti.so
+elif [ -e "$PERF_DIR/libperf-jvmti.so" ]; then
+	LIBJVMTI=$PERF_DIR/libperf-jvmti.so
 elif [ -e "$PREFIX/lib64/libperf-jvmti.so" ]; then
 	LIBJVMTI=$PREFIX/lib64/libperf-jvmti.so
 elif [ -e "$PREFIX/lib/libperf-jvmti.so" ]; then
@@ -34,6 +37,7 @@ elif [ -e "/usr/lib/linux-tools-$(uname -a | awk '{ print $3 }' | sed -r 's/-gen
 	LIBJVMTI=/usr/lib/linux-tools-$(uname -a | awk '{ print $3 }' | sed -r 's/-generic//')/libperf-jvmti.so
 else
 	echo "Fail to find libperf-jvmti.so"
+
 	# JVMTI is a build option, skip the test if fail to find lib
 	exit 2
 fi
-- 
2.52.0.223.gf5cc29aaa4-goog

On Fri, Dec 05, 2025 at 11:01:35AM -0800, Ian Rogers wrote:
> If perf is built into an output directory then so is
> libperf-jvmti.so. If `perf test` is run from that directory then PWD
> needn't also be that directory meaning libperf-jvmti.so won't be found
> and the test skipped. Add an additional check for libperf-jvmti.so in
> the same directory as the perf binary for this case, this avoids the
> test skipping.

Thanks, applied to perf-tools-next,

- Arnaldo
 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/tests/shell/test_java_symbol.sh | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/tools/perf/tests/shell/test_java_symbol.sh b/tools/perf/tests/shell/test_java_symbol.sh
> index 499539d1c479..63a2cc9bf13f 100755
> --- a/tools/perf/tests/shell/test_java_symbol.sh
> +++ b/tools/perf/tests/shell/test_java_symbol.sh
> @@ -22,10 +22,13 @@ cleanup_files()
>  
>  trap cleanup_files exit term int
>  
> +PERF_DIR=$(dirname "$(which perf)")
>  if [ -e "$PWD/tools/perf/libperf-jvmti.so" ]; then
>  	LIBJVMTI=$PWD/tools/perf/libperf-jvmti.so
>  elif [ -e "$PWD/libperf-jvmti.so" ]; then
>  	LIBJVMTI=$PWD/libperf-jvmti.so
> +elif [ -e "$PERF_DIR/libperf-jvmti.so" ]; then
> +	LIBJVMTI=$PERF_DIR/libperf-jvmti.so
>  elif [ -e "$PREFIX/lib64/libperf-jvmti.so" ]; then
>  	LIBJVMTI=$PREFIX/lib64/libperf-jvmti.so
>  elif [ -e "$PREFIX/lib/libperf-jvmti.so" ]; then
> @@ -34,6 +37,7 @@ elif [ -e "/usr/lib/linux-tools-$(uname -a | awk '{ print $3 }' | sed -r 's/-gen
>  	LIBJVMTI=/usr/lib/linux-tools-$(uname -a | awk '{ print $3 }' | sed -r 's/-generic//')/libperf-jvmti.so
>  else
>  	echo "Fail to find libperf-jvmti.so"
> +
>  	# JVMTI is a build option, skip the test if fail to find lib
>  	exit 2
>  fi
> -- 
> 2.52.0.223.gf5cc29aaa4-goog
>