Skip to contentSkip to conversation

perf probe: skip test_uprobe_from_different_cu if there is no gcc

PATCH In review Georg Müller 1 participant 2 messages Jul 28, 2023 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf probe: skip test_uprobe_from_different_cu if there is no gcc

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 56cbeacf1435 ("perf probe: Add test for regression introduced by switch to die_get_decl_file()")
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Masami Hiramatsu (Google) <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
---
 tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/tests/shell/test_uprobe_from_different_cu.sh +7 -1
index 00d2e0e2e0c2..319f36ebb9a4 100755
@@ -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

--
2.41.0

#1 lore raw

Sorry, wrong list... :(

Am 28.07.23 um 16:52 schrieb Georg Müller:

Quoted 51 lines

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 56cbeacf1435 ("perf probe: Add test for regression introduced by switch to die_get_decl_file()")
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Masami Hiramatsu (Google) <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
---
  tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/tests/shell/test_uprobe_from_different_cu.sh +7 -2
index 00d2e0e2e0c2..319f36ebb9a4 100755
@@ -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
--

2.41.0