perf tests: Final cleanup for builtin-test move
Final function renames to match test__* style and include cleanup. Signed-off-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
cff7f956ec
commit
c81251e808
|
@ -178,7 +178,6 @@ extern bool test_attr__enabled;
|
||||||
void test_attr__init(void);
|
void test_attr__init(void);
|
||||||
void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
|
void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
|
||||||
int fd, int group_fd, unsigned long flags);
|
int fd, int group_fd, unsigned long flags);
|
||||||
int test_attr__run(void);
|
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
sys_perf_event_open(struct perf_event_attr *attr,
|
sys_perf_event_open(struct perf_event_attr *attr,
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "../perf.h"
|
#include "../perf.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "exec_cmd.h"
|
#include "exec_cmd.h"
|
||||||
|
#include "tests.h"
|
||||||
|
|
||||||
#define ENV "PERF_TEST_ATTR"
|
#define ENV "PERF_TEST_ATTR"
|
||||||
|
|
||||||
|
@ -151,7 +152,7 @@ static int run_dir(const char *d, const char *perf)
|
||||||
return system(cmd);
|
return system(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
int test_attr__run(void)
|
int test__attr(void)
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
char path_perf[PATH_MAX];
|
char path_perf[PATH_MAX];
|
||||||
|
|
|
@ -4,31 +4,11 @@
|
||||||
* Builtin regression testing command: ever growing number of sanity tests
|
* Builtin regression testing command: ever growing number of sanity tests
|
||||||
*/
|
*/
|
||||||
#include "builtin.h"
|
#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 "tests.h"
|
||||||
|
#include "debug.h"
|
||||||
#include <sched.h>
|
#include "color.h"
|
||||||
|
#include "parse-options.h"
|
||||||
|
#include "symbol.h"
|
||||||
|
|
||||||
static struct test {
|
static struct test {
|
||||||
const char *desc;
|
const char *desc;
|
||||||
|
@ -52,7 +32,7 @@ static struct test {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.desc = "parse events tests",
|
.desc = "parse events tests",
|
||||||
.func = parse_events__test,
|
.func = test__parse_events,
|
||||||
},
|
},
|
||||||
#if defined(__x86_64__) || defined(__i386__)
|
#if defined(__x86_64__) || defined(__i386__)
|
||||||
{
|
{
|
||||||
|
@ -70,7 +50,7 @@ static struct test {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.desc = "Test dso data interface",
|
.desc = "Test dso data interface",
|
||||||
.func = dso__test_data,
|
.func = test__dso_data,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.desc = "roundtrip evsel->name check",
|
.desc = "roundtrip evsel->name check",
|
||||||
|
@ -86,7 +66,7 @@ static struct test {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.desc = "struct perf_event_attr setup",
|
.desc = "struct perf_event_attr setup",
|
||||||
.func = test_attr__run,
|
.func = test__attr,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.func = NULL,
|
.func = NULL,
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include "machine.h"
|
#include "machine.h"
|
||||||
#include "symbol.h"
|
#include "symbol.h"
|
||||||
|
#include "tests.h"
|
||||||
|
|
||||||
#define TEST_ASSERT_VAL(text, cond) \
|
#define TEST_ASSERT_VAL(text, cond) \
|
||||||
do { \
|
do { \
|
||||||
|
@ -95,7 +96,7 @@ struct test_data_offset offsets[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
int dso__test_data(void)
|
int test__dso_data(void)
|
||||||
{
|
{
|
||||||
struct machine machine;
|
struct machine machine;
|
||||||
struct dso *dso;
|
struct dso *dso;
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include "evlist.h"
|
#include "evlist.h"
|
||||||
#include "sysfs.h"
|
#include "sysfs.h"
|
||||||
#include "../../../include/linux/hw_breakpoint.h"
|
#include "../../../include/linux/hw_breakpoint.h"
|
||||||
|
#include "tests.h"
|
||||||
|
|
||||||
#define TEST_ASSERT_VAL(text, cond) \
|
#define TEST_ASSERT_VAL(text, cond) \
|
||||||
do { \
|
do { \
|
||||||
|
@ -1086,7 +1087,7 @@ static int test_pmu_events(void)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int parse_events__test(void)
|
int test__parse_events(void)
|
||||||
{
|
{
|
||||||
int ret1, ret2 = 0;
|
int ret1, ret2 = 0;
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,9 @@ int test__perf_evsel__roundtrip_name_test(void);
|
||||||
int test__perf_evsel__tp_sched_test(void);
|
int test__perf_evsel__tp_sched_test(void);
|
||||||
int test__syscall_open_tp_fields(void);
|
int test__syscall_open_tp_fields(void);
|
||||||
int test__pmu(void);
|
int test__pmu(void);
|
||||||
|
int test__attr(void);
|
||||||
|
int test__dso_data(void);
|
||||||
|
int test__parse_events(void);
|
||||||
|
|
||||||
/* Util */
|
/* Util */
|
||||||
int trace_event__id(const char *evname);
|
int trace_event__id(const char *evname);
|
||||||
|
|
|
@ -99,7 +99,6 @@ void parse_events__set_leader(char *name, struct list_head *list);
|
||||||
void parse_events_update_lists(struct list_head *list_event,
|
void parse_events_update_lists(struct list_head *list_event,
|
||||||
struct list_head *list_all);
|
struct list_head *list_all);
|
||||||
void parse_events_error(void *data, void *scanner, char const *msg);
|
void parse_events_error(void *data, void *scanner, char const *msg);
|
||||||
int parse_events__test(void);
|
|
||||||
|
|
||||||
void print_events(const char *event_glob, bool name_only);
|
void print_events(const char *event_glob, bool name_only);
|
||||||
void print_events_type(u8 type);
|
void print_events_type(u8 type);
|
||||||
|
|
|
@ -224,7 +224,6 @@ size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp);
|
||||||
size_t symbol__fprintf(struct symbol *sym, FILE *fp);
|
size_t symbol__fprintf(struct symbol *sym, FILE *fp);
|
||||||
bool symbol_type__is_a(char symbol_type, enum map_type map_type);
|
bool symbol_type__is_a(char symbol_type, enum map_type map_type);
|
||||||
|
|
||||||
int dso__test_data(void);
|
|
||||||
int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,
|
int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,
|
||||||
struct symsrc *runtime_ss, symbol_filter_t filter,
|
struct symsrc *runtime_ss, symbol_filter_t filter,
|
||||||
int kmodule);
|
int kmodule);
|
||||||
|
|
Loading…
Reference in New Issue