perf tests: Check python path on attr and binding test (000ae33f) · Commits · 戴 / test

Current perf test code tries to execute python version 2 in order to test attributes on perf_event_open syscall. However it's not default python version anymore a system can have python v3 only or v2 with a different name (e.g. python2). So if there's no such python interpreter with the name 'python', the test would fail like this (yes, it's happened on my new archlinux laptop :). 13: struct perf_event_attr setup 🇸🇭 python: command not found FAILED! As we can pass name of the python interpreter on make, use it for the attr test also. Signed-off-by:

Namhyung Kim <namhyung@kernel.org> Acked-by:

Jiri Olsa <jolsa@redhat.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1355729101-31317-1-git-send-email-namhyung@kernel.org [ committer note: Added the same mechanism to the python binding test ] Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/Makefile

+5 −2

Original line number	Diff line number	Diff line
		@@ -953,11 +953,14 @@ $(OUTPUT)util/exec_cmd.o: util/exec_cmd.c $(OUTPUT)PERF-CFLAGS

		$(OUTPUT)tests/attr.o: tests/attr.c $(OUTPUT)PERF-CFLAGS
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) \
		'-DBINDIR="$(bindir_SQ)"' \
		'-DBINDIR="$(bindir_SQ)"' -DPYTHON='"$(PYTHON_WORD)"' \
		$<

		$(OUTPUT)tests/python-use.o: tests/python-use.c $(OUTPUT)PERF-CFLAGS
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DPYTHONPATH='"$(OUTPUT)/python"' $<
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) \
		-DPYTHONPATH='"$(OUTPUT)/python"' \
		-DPYTHON='"$(PYTHON_WORD)"' \
		$<

		$(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS
		$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<

tools/perf/tests/attr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static int run_dir(const char d, const char perf)
		{
		char cmd[3*PATH_MAX];

		snprintf(cmd, 3*PATH_MAX, "python %s/attr.py -d %s/attr/ -p %s %s",
		snprintf(cmd, 3*PATH_MAX, PYTHON " %s/attr.py -d %s/attr/ -p %s %s",
		d, d, perf, verbose ? "-v" : "");

		return system(cmd);

tools/perf/tests/python-use.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,8 @@ int test__python_use(void)
		char *cmd;
		int ret;

		if (asprintf(&cmd, "echo \"import sys ; sys.path.append('%s'); import perf\" \| python %s",
		PYTHONPATH, verbose ? "" : "2> /dev/null") < 0)
		if (asprintf(&cmd, "echo \"import sys ; sys.path.append('%s'); import perf\" \| %s %s",
		PYTHONPATH, PYTHON, verbose ? "" : "2> /dev/null") < 0)
		return -1;

		ret = system(cmd) ? -1 : 0;

Admin message