Commit 8226e4a3 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Use common python setup library 



Avoid replicated logic by having a common library to set the PYTHON
environment variable.

Reviewed-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231129213428.2227448-3-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b809fc65

tools/perf/tests/shell/lib/setup_python.sh

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



if [ "x$PYTHON" = "x" ]

then

  python3 --version >/dev/null 2>&1 && PYTHON=python3

fi

if [ "x$PYTHON" = "x" ]

then

  python --version >/dev/null 2>&1 && PYTHON=python

fi

if [ "x$PYTHON" = "x" ]

then

  echo Skipping test, python not detected please set environment variable PYTHON.

  exit 2

fi

tools/perf/tests/shell/stat+json_output.sh

+3 −13
Original line number Diff line number Diff line
@@ -8,20 +8,10 @@ set -e 


skip_test=0



shelldir=$(dirname "$0")

# shellcheck source=lib/setup_python.sh

. "${shelldir}"/lib/setup_python.sh

pythonchecker=$(dirname $0)/lib/perf_json_output_lint.py

if [ "x$PYTHON" == "x" ]

then

	if which python3 > /dev/null

	then

		PYTHON=python3

	elif which python > /dev/null

	then

		PYTHON=python

	else

		echo Skipping test, python not detected please set environment variable PYTHON.

		exit 2

	fi

fi



stat_output=$(mktemp /tmp/__perf_test.stat_output.json.XXXXX)

tools/perf/tests/shell/stat_metrics_values.sh

+4 −10
Original line number Diff line number Diff line 
#!/bin/bash

# perf metrics value validation

# SPDX-License-Identifier: GPL-2.0

if [ "x$PYTHON" == "x" ]

then

	if which python3 > /dev/null

	then

		PYTHON=python3

	else

		echo Skipping test, python3 not detected please set environment variable PYTHON.

		exit 2

	fi

fi



shelldir=$(dirname "$0")

# shellcheck source=lib/setup_python.sh

. "${shelldir}"/lib/setup_python.sh



grep -q GenuineIntel /proc/cpuinfo || { echo Skipping non-Intel; exit 2; }

tools/perf/tests/shell/test_perf_data_converter_json.sh

+3 −10
Original line number Diff line number Diff line
@@ -6,16 +6,9 @@ set -e 


err=0



if [ "$PYTHON" = "" ] ; then

	if which python3 > /dev/null ; then

		PYTHON=python3

	elif which python > /dev/null ; then

		PYTHON=python

	else

		echo Skipping test, python not detected please set environment variable PYTHON.

		exit 2

	fi

fi

shelldir=$(dirname "$0")

# shellcheck source=lib/setup_python.sh

. "${shelldir}"/lib/setup_python.sh



perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)

result=$(mktemp /tmp/__perf_test.output.json.XXXXX)