linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Richter <tmricht@linux.vnet.ibm.com>
To: acme@kernel.org, jolsa@redhat.com, linux-perf-users@vger.kernel.org
Cc: brueckner@linux.vnet.ibm.com,
	Thomas Richter <tmricht@linux.vnet.ibm.com>
Subject: [PATCH 1/9] perf: test 15 fix python error on empty result
Date: Wed,  9 Aug 2017 08:40:32 +0200	[thread overview]
Message-ID: <20170809064040.50899-1-tmricht@linux.vnet.ibm.com> (raw)

Commit d78ada4a767 ("perf tests attr: Do not store failed events")
does not create an event file in the /tmp directory when the
perf_open_event() system call failed.
This can lead to a situation where not /tmp/event-xx-yy-zz result
file exists at all (for example on a s390x virtual machine environment)
where no CPUMF hardware is available.

The following command then fails with a python call back chain
instead of printing failure:
[root@s8360046 perf]# /usr/bin/python2 ./tests/attr.py -d ./tests/attr/ \
    -p ./perf -v -ttest-stat-basic
running './tests/attr//test-stat-basic'
Traceback (most recent call last):
  File "./tests/attr.py", line 379, in <module>
    main()
  File "./tests/attr.py", line 370, in main
    run_tests(options)
  File "./tests/attr.py", line 311, in run_tests
    Test(f, options).run()
  File "./tests/attr.py", line 300, in run
    self.compare(self.expect, self.result)
  File "./tests/attr.py", line 248, in compare
    exp_event.diff(res_event)
UnboundLocalError: local variable 'res_event' referenced before assignment
[root@s8360046 perf]#

This patch catches this pitfall and prints an error message
instead:
[root@s8360047 perf]# /usr/bin/python2 ./tests/attr.py -d ./tests/attr/ \
     -p ./perf  -vvv -ttest-stat-basic
running './tests/attr//test-stat-basic'
  loading expected events
    Event event:base-stat
      fd = 1
      group_fd = -1
      flags = 0|8
      [....]
      sample_regs_user = 0
      sample_stack_user = 0
  'PERF_TEST_ATTR=/tmp/tmpJbMQMP ./perf stat -o /tmp/tmpJbMQMP/perf.data -e cycles kill >/dev/null 2>&1' ret '1', expected '1'
  loading result events
  compare
    matching [event:base-stat]
    match: [event:base-stat] matches []
    res_event is empty
FAILED './tests/attr//test-stat-basic' - match failure
[root@s8360047 perf]#

Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
---
 tools/perf/tests/attr.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/perf/tests/attr.py b/tools/perf/tests/attr.py
index 6bb50e8..a13cd78 100644
--- a/tools/perf/tests/attr.py
+++ b/tools/perf/tests/attr.py
@@ -237,6 +237,7 @@ class Test(object):
         # events in result. Fail if there's not any.
         for exp_name, exp_event in expect.items():
             exp_list = []
+            res_event = {}
             log.debug("    matching [%s]" % exp_name)
             for res_name, res_event in result.items():
                 log.debug("      to [%s]" % res_name)
@@ -253,7 +254,10 @@ class Test(object):
                 if exp_event.optional():
                     log.debug("    %s does not match, but is optional" % exp_name)
                 else:
-                    exp_event.diff(res_event)
+                    if not res_event:
+                        log.debug("    res_event is empty");
+                    else:
+                        exp_event.diff(res_event)
                     raise Fail(self, 'match failure');
 
             match[exp_name] = exp_list
-- 
2.9.3

             reply	other threads:[~2017-08-09  6:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-09  6:40 Thomas Richter [this message]
2017-08-09  6:40 ` [PATCH 2/9] perf test: perf test case 15 result ignored Thomas Richter
2017-08-09  6:40 ` [PATCH 3/9] perf: test 15 fix test-stat-group tests Thomas Richter
2017-08-09 15:15   ` Jiri Olsa
2017-08-09  6:40 ` [PATCH 4/9] perf: test 15 add s390x support for stat test cases Thomas Richter
2017-08-09 15:22   ` Jiri Olsa
2017-08-10  7:15     ` Thomas Richter
2017-08-09  6:40 ` [PATCH 5/9] perf test 15: disable test-record-group tests on s390x Thomas Richter
2017-08-09  6:40 ` [PATCH 6/9] perf test 15: disable test-record-filter " Thomas Richter
2017-08-09  6:40 ` [PATCH 7/9] perf test 15: disable test-record-graph-dwarf test " Thomas Richter
2017-08-09  6:40 ` [PATCH 8/9] perf: test 15 change period and frequency for s390x Thomas Richter
2017-08-09  6:40 ` [PATCH 9/9] perf: test 15 fix expected task value Thomas Richter
2017-08-09 15:01   ` Jiri Olsa
2017-08-09 10:39 ` [PATCH 1/9] perf: test 15 fix python error on empty result Jiri Olsa
2017-08-09 11:02   ` Thomas-Mich Richter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170809064040.50899-1-tmricht@linux.vnet.ibm.com \
    --to=tmricht@linux.vnet.ibm.com \
    --cc=acme@kernel.org \
    --cc=brueckner@linux.vnet.ibm.com \
    --cc=jolsa@redhat.com \
    --cc=linux-perf-users@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).