Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c81251e8 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tests: Final cleanup for builtin-test move 



Final function renames to match test__* style and include cleanup.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1352508412-16914-12-git-send-email-jolsa@redhat.com


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

tools/perf/perf.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ extern bool test_attr__enabled; 
void test_attr__init(void);

void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,

		     int fd, int group_fd, unsigned long flags);

int  test_attr__run(void);



static inline int

sys_perf_event_open(struct perf_event_attr *attr,

tools/perf/tests/attr.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "../perf.h"

#include "util.h"

#include "exec_cmd.h"

#include "tests.h"



#define ENV "PERF_TEST_ATTR"
@@ -151,7 +152,7 @@ static int run_dir(const char *d, const char *perf) 
	return system(cmd);

}



int test_attr__run(void)

int test__attr(void)

{

	struct stat st;

	char path_perf[PATH_MAX];

tools/perf/tests/builtin-test.c

+7 −27
Original line number Diff line number Diff line
@@ -4,31 +4,11 @@ 
 * Builtin regression testing command: ever growing number of sanity tests

 */

#include "builtin.h"



#include "util/cache.h"

#include "util/color.h"

#include "util/debug.h"

#include "util/debugfs.h"

#include "util/evlist.h"

#include "util/machine.h"

#include "util/parse-options.h"

#include "util/parse-events.h"

#include "util/symbol.h"

#include "util/thread_map.h"

#include "util/pmu.h"

#include "event-parse.h"

#include "../../include/linux/hw_breakpoint.h"



#include <sys/mman.h>



#include "util/cpumap.h"

#include "util/evsel.h"

#include <sys/types.h>



#include "tests.h"



#include <sched.h>



#include "debug.h"

#include "color.h"

#include "parse-options.h"

#include "symbol.h"



static struct test {

	const char *desc;
@@ -52,7 +32,7 @@ static struct test { 
	},

	{

		.desc = "parse events tests",

		.func = parse_events__test,

		.func = test__parse_events,

	},

#if defined(__x86_64__) || defined(__i386__)

	{
@@ -70,7 +50,7 @@ static struct test { 
	},

	{

		.desc = "Test dso data interface",

		.func = dso__test_data,

		.func = test__dso_data,

	},

	{

		.desc = "roundtrip evsel->name check",
@@ -86,7 +66,7 @@ static struct test { 
	},

	{

		.desc = "struct perf_event_attr setup",

		.func = test_attr__run,

		.func = test__attr,

	},

	{

		.func = NULL,

tools/perf/tests/dso-data.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include "machine.h"

#include "symbol.h"

#include "tests.h"



#define TEST_ASSERT_VAL(text, cond) \

do { \
@@ -95,7 +96,7 @@ struct test_data_offset offsets[] = { 
	},

};



int dso__test_data(void)

int test__dso_data(void)

{

	struct machine machine;

	struct dso *dso;

tools/perf/tests/parse-events.c

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "evlist.h"

#include "sysfs.h"

#include "../../../include/linux/hw_breakpoint.h"

#include "tests.h"



#define TEST_ASSERT_VAL(text, cond) \

do { \
@@ -1086,7 +1087,7 @@ static int test_pmu_events(void) 
	return ret;

}



int parse_events__test(void)

int test__parse_events(void)

{

	int ret1, ret2 = 0;