From f7c64474242701eb24f6fe96f8df0389a2b800f7 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Fri, 3 Jan 2014 15:32:33 +0100 Subject: [PATCH] perf tests: Fix installation tests path setup Currently installation tests work only over x86_64, adding arch check to make it work over i386 as well. NOTE looks like x86 is the only arch running tests, we need some IS_(32/64) flag to make this generic. Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jiri Olsa Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1388759553-12974-2-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/make | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index f641c35..e341088 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -1,6 +1,16 @@ PERF := . MK := Makefile +include config/Makefile.arch + +# FIXME looks like x86 is the only arch running tests ;-) +# we need some IS_(32/64) flag to make this generic +ifeq ($(IS_X86_64),1) +lib = lib64 +else +lib = lib +endif + has = $(shell which $1 2>/dev/null) # standard single make variable specified @@ -118,16 +128,16 @@ installed_files_bin := bin/perf installed_files_bin += etc/bash_completion.d/perf installed_files_bin += libexec/perf-core/perf-archive -installed_files_plugins := lib64/traceevent/plugins/plugin_cfg80211.so -installed_files_plugins += lib64/traceevent/plugins/plugin_scsi.so -installed_files_plugins += lib64/traceevent/plugins/plugin_xen.so -installed_files_plugins += lib64/traceevent/plugins/plugin_function.so -installed_files_plugins += lib64/traceevent/plugins/plugin_sched_switch.so -installed_files_plugins += lib64/traceevent/plugins/plugin_mac80211.so -installed_files_plugins += lib64/traceevent/plugins/plugin_kvm.so -installed_files_plugins += lib64/traceevent/plugins/plugin_kmem.so -installed_files_plugins += lib64/traceevent/plugins/plugin_hrtimer.so -installed_files_plugins += lib64/traceevent/plugins/plugin_jbd2.so +installed_files_plugins := $(lib)/traceevent/plugins/plugin_cfg80211.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_scsi.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_xen.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_function.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_sched_switch.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_mac80211.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_kvm.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_kmem.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_hrtimer.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_jbd2.so installed_files_all := $(installed_files_bin) installed_files_all += $(installed_files_plugins) -- 2.7.4