7138290 combining -o and -s for run.py results in traceback s11u1b21
authorDave Vadovszki <dave.vadovszki@oracle.com>
Fri, 22 Jun 2012 14:00:55 -0600
changeset 2740 034905ef68e2
parent 2739 bb720141b4f5
child 2742 3a261ac312c5
7138290 combining -o and -s for run.py results in traceback
src/tests/run.py
--- a/src/tests/run.py	Mon Jul 16 16:12:20 2012 -0700
+++ b/src/tests/run.py	Fri Jun 22 14:00:55 2012 -0600
@@ -171,10 +171,12 @@
                                     filename, cname, attrname)
                                 # Remove this function from our class obj if
                                 # it doesn't match the test pattern
-                                if re.search(startatpat, full):
-                                        seen = True
                                 if not seen:
-                                        delattr(classobj, attrname)
+                                        if re.search(startatpat, full):
+                                                seen = True
+                                        else:
+                                                delattr(classobj, attrname)
+                                                continue
                                 found = reduce(lambda x, y: x or y,
                                     [ re.search(pat, full) for pat in pats ],
                                     None)