From abc01f42e19003164af91f04a059146c09037de1 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Thu, 8 Nov 2012 17:01:01 +0100
Subject: [PATCH] --- yaml --- r: 338970 b: refs/heads/master c:
 d4fcf0a8b96b23a245a21065c9424e09c8080819 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/tools/perf/tests/attr.py | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index d0bb688dafe7..b13023a17ce3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 580e338d7e9dc4947cba2e1021e78e76ebe0869e
+refs/heads/master: d4fcf0a8b96b23a245a21065c9424e09c8080819
diff --git a/trunk/tools/perf/tests/attr.py b/trunk/tools/perf/tests/attr.py
index 9b25b33cf3e9..e702b82dcb86 100644
--- a/trunk/tools/perf/tests/attr.py
+++ b/trunk/tools/perf/tests/attr.py
@@ -228,24 +228,26 @@ def resolve_groups(self, events):
     def run(self):
         tempdir = tempfile.mkdtemp();
 
-        # run the test script
-        self.run_cmd(tempdir);
+        try:
+            # run the test script
+            self.run_cmd(tempdir);
 
-        # load events expectation for the test
-        log.info("  loading result events");
-        for f in glob.glob(tempdir + '/event*'):
-            self.load_events(f, self.result);
+            # load events expectation for the test
+            log.info("  loading result events");
+            for f in glob.glob(tempdir + '/event*'):
+                self.load_events(f, self.result);
 
-        # resolve group_fd to event names
-        self.resolve_groups(self.expect);
-        self.resolve_groups(self.result);
+            # resolve group_fd to event names
+            self.resolve_groups(self.expect);
+            self.resolve_groups(self.result);
 
-        # do the expectation - results matching - both ways
-        self.compare(self.expect, self.result)
-        self.compare(self.result, self.expect)
+            # do the expectation - results matching - both ways
+            self.compare(self.expect, self.result)
+            self.compare(self.result, self.expect)
 
-        # cleanup
-        shutil.rmtree(tempdir)
+        finally:
+            # cleanup
+            shutil.rmtree(tempdir)
 
 
 def run_tests(options):