Reverting unwanted changes to the test suite

llvm-svn: 166627

diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
index a6541ad7b0bb752e893c446351ca1122d2b5368f..05d1c79332e2e4e83e67d8b5e0f1017f688c7917 100644 (file)
--- 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 22097b37040f70a36c4accaa7b714bb75e07ae8e..ea5a2a631dda755d06ffb9bf8198131a08e128a0 100644 (file)
--- 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