Commit 1b047dc9 authored Jul 28, 2023 by Georg Müller Committed by Greg Kroah-Hartman Aug 11, 2023

perf test uprobe_from_different_cu: Skip if there is no gcc



[ Upstream commit 98ce8e4a9dcfb448b30a2d7a16190f4a00382377 ]

Without gcc, the test will fail.

On cleanup, ignore probe removal errors. Otherwise, in case of an error
adding the probe, the temporary directory is not removed.

Fixes: 56cbeacf14353057 ("perf probe: Add test for regression introduced by switch to die_get_decl_file()")
Signed-off-by: Georg Müller <georgmueller@gmx.net>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Georg Müller <georgmueller@gmx.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230728151812.454806-2-georgmueller@gmx.net
Link: https://lore.kernel.org/r/CAP-5=fUP6UuLgRty3t2=fQsQi3k4hDMz415vWdp1x88QMvZ8ug@mail.gmail.com/


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent ad46d486

tools/perf/tests/shell/test_uprobe_from_different_cu.sh

+7 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,12 @@

		set -e

		# skip if there's no gcc
		if ! [ -x "$(command -v gcc)" ]; then
		echo "failed: no gcc compiler"
		exit 2
		fi

		temp_dir=$(mktemp -d /tmp/perf-uprobe-different-cu-sh.XXXXXXXXXX)

		cleanup()
		@@ -11,7 +17,7 @@ cleanup()
		trap - EXIT TERM INT
		if [[ "${temp_dir}" =~ ^/tmp/perf-uprobe-different-cu-sh.*$ ]]; then
		echo "--- Cleaning up ---"
		perf probe -x ${temp_dir}/testfile -d foo
		perf probe -x ${temp_dir}/testfile -d foo \|\| true
		rm -f "${temp_dir}/"*
		rmdir "${temp_dir}"
		fi