summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2012-10-24 21:44:48 +0000
committerEnrico Granata <egranata@apple.com>2012-10-24 21:44:48 +0000
commit1918627d93a315147128666e0c99b3b1cc9aee69 (patch)
tree595c0b3efbe3ca709e17f3780c03966210191a10
parent5020f958d8fd310cec0b3bea42cae66578247ee6 (diff)
downloadbcm5719-llvm-1918627d93a315147128666e0c99b3b1cc9aee69.tar.gz
bcm5719-llvm-1918627d93a315147128666e0c99b3b1cc9aee69.zip
Reverting unwanted changes to the test suite
llvm-svn: 166627
-rw-r--r--lldb/test/expression_command/call-function/TestCallStdStringFunction.py2
-rw-r--r--lldb/test/lldbtest.py13
2 files changed, 3 insertions, 12 deletions
diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
index a6541ad7b0b..05d1c79332e 100644
--- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
@@ -9,7 +9,7 @@ from lldbtest import *
class ExprCommandCallFunctionTestCase(TestBase):
- mydir = os.path.join("expressioa_command", "call-function")
+ mydir = os.path.join("expression_command", "call-function")
def setUp(self):
# Call super's setUp().
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 22097b37040..ea5a2a631dd 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -417,18 +417,9 @@ class Base(unittest2.TestCase):
accomplish things.
"""
- mydir_ = None
- @classmethod
- def mydir_get(cls):
- return cls.mydir_
-
- @classmethod
- def mydir_set(cls,val):
- print "mydir_set"
- cls.mydir_ = val
-
- Base.mydir = property(mydir_get,mydir_set)
+ # The concrete subclass should override this attribute.
+ mydir = None
# Keep track of the old current working directory.
oldcwd = None
OpenPOWER on IntegriCloud