aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/tests/attr.c9
-rw-r--r--tools/perf/tests/attr.py4
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c
index bdcceb886f77..038de3ecb8cb 100644
--- a/tools/perf/tests/attr.c
+++ b/tools/perf/tests/attr.c
@@ -147,10 +147,15 @@ void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
147 147
148static int run_dir(const char *d, const char *perf) 148static int run_dir(const char *d, const char *perf)
149{ 149{
150 char v[] = "-vvvvv";
151 int vcnt = min(verbose, (int) sizeof(v) - 1);
150 char cmd[3*PATH_MAX]; 152 char cmd[3*PATH_MAX];
151 153
152 snprintf(cmd, 3*PATH_MAX, PYTHON " %s/attr.py -d %s/attr/ -p %s %s", 154 if (verbose)
153 d, d, perf, verbose ? "-v" : ""); 155 vcnt++;
156
157 snprintf(cmd, 3*PATH_MAX, PYTHON " %s/attr.py -d %s/attr/ -p %s %.*s",
158 d, d, perf, vcnt, v);
154 159
155 return system(cmd); 160 return system(cmd);
156} 161}
diff --git a/tools/perf/tests/attr.py b/tools/perf/tests/attr.py
index 2f629ca485bc..e0ea51335e9c 100644
--- a/tools/perf/tests/attr.py
+++ b/tools/perf/tests/attr.py
@@ -121,7 +121,7 @@ class Test(object):
121 parser = ConfigParser.SafeConfigParser() 121 parser = ConfigParser.SafeConfigParser()
122 parser.read(path) 122 parser.read(path)
123 123
124 log.debug("running '%s'" % path) 124 log.warning("running '%s'" % path)
125 125
126 self.path = path 126 self.path = path
127 self.test_dir = options.test_dir 127 self.test_dir = options.test_dir
@@ -172,7 +172,7 @@ class Test(object):
172 self.perf, self.command, tempdir, self.args) 172 self.perf, self.command, tempdir, self.args)
173 ret = os.WEXITSTATUS(os.system(cmd)) 173 ret = os.WEXITSTATUS(os.system(cmd))
174 174
175 log.warning(" running '%s' ret %d " % (cmd, ret)) 175 log.info(" '%s' ret %d " % (cmd, ret))
176 176
177 if ret != int(self.ret): 177 if ret != int(self.ret):
178 raise Unsup(self) 178 raise Unsup(self)