Skip to content

Commit

Permalink
[InlineTest] getRerunArgs returns an empty string if the test was ski…
Browse files Browse the repository at this point in the history
…pped.

Summary:
The main issue that this patch is trying to address is that the current
implementation of getRerunArgs of InlineTest relies on the attribute
'using_dsym' which could be absent if the test was skipped altogether.
[That is, if both dsym and dwarf tests were skipped.]

While at it, the use of deprecated Python module 'new' is eliminated.

Test Plan: [Linux] dotest.py -p TestExprPathSynthetic

Reviewers: vharron, clayborg

Reviewed By: clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D6888

llvm-svn: 225496
  • Loading branch information
Siva Chandra committed Jan 9, 2015
1 parent 203f91e commit 311c7db
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lldb/test/lldbinline.py
Expand Up @@ -2,7 +2,6 @@
from lldbtest import *
import lldbutil
import os
import new
import unittest2
import sys

Expand Down Expand Up @@ -72,7 +71,10 @@ class InlineTest(TestBase):
def getRerunArgs(self):
# The -N option says to NOT run a if it matches the option argument, so
# if we are using dSYM we say to NOT run dwarf (-N dwarf) and vice versa.
if self.using_dsym:
if self.using_dsym is None:
# The test was skipped altogether.
return ""
elif self.using_dsym:
return "-N dwarf %s" % (self.mydir)
else:
return "-N dsym %s" % (self.mydir)
Expand Down Expand Up @@ -179,7 +181,7 @@ def MakeInlineTest(__file, __globals, decorators=None):

test_name, _ = os.path.splitext(file_basename)
# Build the test case
test = new.classobj(test_name, (InlineTest,), {})
test = type(test_name, (InlineTest,), {'using_dsym': None})
test.name = test_name

test.test_with_dsym = ApplyDecoratorsToFunction(test._InlineTest__test_with_dsym, decorators)
Expand Down

0 comments on commit 311c7db

Please sign in to comment.