[Lldb-commits] [lldb] r133749 - in /lldb/trunk/test/types: AbstractBase.py TestFloatTypes.py TestFloatTypesExpr.py TestIntegerTypes.py TestIntegerTypesExpr.py

Johnny Chen johnny.chen at apple.com
Thu Jun 23 13:10:24 PDT 2011


Author: johnny
Date: Thu Jun 23 15:10:23 2011
New Revision: 133749

URL: http://llvm.org/viewvc/llvm-project?rev=133749&view=rev
Log:
Refactorings of the test/types directory to more elegantly express the uniqueness of
executable names given to each test method.

Modified:
    lldb/trunk/test/types/AbstractBase.py
    lldb/trunk/test/types/TestFloatTypes.py
    lldb/trunk/test/types/TestFloatTypesExpr.py
    lldb/trunk/test/types/TestIntegerTypes.py
    lldb/trunk/test/types/TestIntegerTypesExpr.py

Modified: lldb/trunk/test/types/AbstractBase.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/AbstractBase.py?rev=133749&r1=133748&r2=133749&view=diff
==============================================================================
--- lldb/trunk/test/types/AbstractBase.py (original)
+++ lldb/trunk/test/types/AbstractBase.py Thu Jun 23 15:10:23 2011
@@ -20,6 +20,15 @@
     # Assert message.
     DATA_TYPE_GROKKED = "Data type from expr parser output is parsed correctly"
 
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # We'll use the test method name as the exe_name.
+        # There are a bunch of test cases under test/types and we don't want the
+        # module cacheing subsystem to be confused with executable name "a.out"
+        # used for all the test cases.
+        self.exe_name = self._testMethodName
+
     def generic_type_tester(self, exe_name, atoms, quotedDisplay=False):
         """Test that variables with basic types are displayed correctly."""
 

Modified: lldb/trunk/test/types/TestFloatTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestFloatTypes.py?rev=133749&r1=133748&r2=133749&view=diff
==============================================================================
--- lldb/trunk/test/types/TestFloatTypes.py (original)
+++ lldb/trunk/test/types/TestFloatTypes.py Thu Jun 23 15:10:23 2011
@@ -14,32 +14,32 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_float_type_with_dsym(self):
         """Test that float-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'float.cpp', 'EXE': 'float_type_dsym'}
+        d = {'CXX_SOURCES': 'float.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.float_type('float_type_dsym')
+        self.float_type(self.exe_name)
 
     def test_float_type_with_dwarf(self):
         """Test that float-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'float.cpp', 'EXE': 'float_type_dwarf'}
+        d = {'CXX_SOURCES': 'float.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.float_type('float_type_dwarf')
+        self.float_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_double_type_with_dsym(self):
         """Test that double-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'double.cpp', 'EXE': 'double_type_dsym'}
+        d = {'CXX_SOURCES': 'double.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.double_type('double_type_dsym')
+        self.double_type(self.exe_name)
 
     def test_double_type_with_dwarf(self):
         """Test that double-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'double.cpp', 'EXE': 'double_type_dwarf'}
+        d = {'CXX_SOURCES': 'double.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.double_type('double_type_dwarf')
+        self.double_type(self.exe_name)
 
     def float_type(self, exe_name):
         """Test that float-type variables are displayed correctly."""

Modified: lldb/trunk/test/types/TestFloatTypesExpr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestFloatTypesExpr.py?rev=133749&r1=133748&r2=133749&view=diff
==============================================================================
--- lldb/trunk/test/types/TestFloatTypesExpr.py (original)
+++ lldb/trunk/test/types/TestFloatTypesExpr.py Thu Jun 23 15:10:23 2011
@@ -17,32 +17,32 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_float_type_with_dsym(self):
         """Test that float-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'float.cpp', 'EXE': 'float_type_dsym'}
+        d = {'CXX_SOURCES': 'float.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.float_type_expr('float_type_dsym')
+        self.float_type_expr(self.exe_name)
 
     def test_float_type_with_dwarf(self):
         """Test that float-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'float.cpp', 'EXE': 'float_type_dwarf'}
+        d = {'CXX_SOURCES': 'float.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.float_type_expr('float_type_dwarf')
+        self.float_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_double_type_with_dsym(self):
         """Test that double-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'double.cpp', 'EXE': 'double_type_dsym'}
+        d = {'CXX_SOURCES': 'double.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.double_type_expr('double_type_dsym')
+        self.double_type_expr(self.exe_name)
 
     def test_double_type_with_dwarf(self):
         """Test that double-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'double.cpp', 'EXE': 'double_type_dwarf'}
+        d = {'CXX_SOURCES': 'double.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.double_type_expr('double_type_dwarf')
+        self.double_type_expr(self.exe_name)
 
     def float_type_expr(self, exe_name):
         """Test that float-type variable expressions are evaluated correctly."""

Modified: lldb/trunk/test/types/TestIntegerTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestIntegerTypes.py?rev=133749&r1=133748&r2=133749&view=diff
==============================================================================
--- lldb/trunk/test/types/TestIntegerTypes.py (original)
+++ lldb/trunk/test/types/TestIntegerTypes.py Thu Jun 23 15:10:23 2011
@@ -14,122 +14,122 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_char_type_with_dsym(self):
         """Test that char-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'char.cpp', 'EXE': 'char_type_dsym'}
+        d = {'CXX_SOURCES': 'char.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.char_type('char_type_dsym')
+        self.char_type(self.exe_name)
 
     def test_char_type_with_dwarf(self):
         """Test that char-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'char.cpp', 'EXE': 'char_type_dwarf'}
+        d = {'CXX_SOURCES': 'char.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.char_type('char_type_dwarf')
+        self.char_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_char_type_with_dsym(self):
         """Test that 'unsigned_char'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': 'unsigned_char_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_char_type('unsigned_char_type_dsym')
+        self.unsigned_char_type(self.exe_name)
 
     def test_unsigned_char_type_with_dwarf(self):
         """Test that 'unsigned char'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': 'unsigned_char_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_char_type('unsigned_char_type_dwarf')
+        self.unsigned_char_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_short_type_with_dsym(self):
         """Test that short-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'short.cpp', 'EXE': 'short_type_dsym'}
+        d = {'CXX_SOURCES': 'short.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.short_type('short_type_dsym')
+        self.short_type(self.exe_name)
 
     def test_short_type_with_dwarf(self):
         """Test that short-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'short.cpp', 'EXE': 'short_type_dwarf'}
+        d = {'CXX_SOURCES': 'short.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.short_type('short_type_dwarf')
+        self.short_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_short_type_with_dsym(self):
         """Test that 'unsigned_short'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': 'unsigned_short_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_short_type('unsigned_short_type_dsym')
+        self.unsigned_short_type(self.exe_name)
 
     def test_unsigned_short_type_with_dwarf(self):
         """Test that 'unsigned short'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': 'unsigned_short_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_short_type('unsigned_short_type_dwarf')
+        self.unsigned_short_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_int_type_with_dsym(self):
         """Test that int-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'int.cpp', 'EXE': 'int_type_dsym'}
+        d = {'CXX_SOURCES': 'int.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.int_type('int_type_dsym')
+        self.int_type(self.exe_name)
 
     def test_int_type_with_dwarf(self):
         """Test that int-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'int.cpp', 'EXE': 'int_type_dwarf'}
+        d = {'CXX_SOURCES': 'int.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.int_type('int_type_dwarf')
+        self.int_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_int_type_with_dsym(self):
         """Test that 'unsigned_int'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': 'unsigned_int_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_int_type('unsigned_int_type_dsym')
+        self.unsigned_int_type(self.exe_name)
 
     def test_unsigned_int_type_with_dwarf(self):
         """Test that 'unsigned int'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': 'unsigned_int_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_int_type('unsigned_int_type_dwarf')
+        self.unsigned_int_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_long_type_with_dsym(self):
         """Test that long-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'long.cpp', 'EXE': 'long_type_dsym'}
+        d = {'CXX_SOURCES': 'long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_type('long_type_dsym')
+        self.long_type(self.exe_name)
 
     def test_long_type_with_dwarf(self):
         """Test that long-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'long.cpp', 'EXE': 'long_type_dwarf'}
+        d = {'CXX_SOURCES': 'long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_type('long_type_dwarf')
+        self.long_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_long_type_with_dsym(self):
         """Test that 'unsigned long'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': 'unsigned_long_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_type('unsigned_long_type_dsym')
+        self.unsigned_long_type(self.exe_name)
 
     def test_unsigned_long_type_with_dwarf(self):
         """Test that 'unsigned long'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': 'unsigned_long_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_type('unsigned_long_type_dwarf')
+        self.unsigned_long_type(self.exe_name)
 
     # rdar://problem/8482903
     # test suite failure for types dir -- "long long" and "unsigned long long"
@@ -137,32 +137,32 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_long_long_type_with_dsym(self):
         """Test that 'long long'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': 'long_long_type_dsym'}
+        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_long_type('long_long_type_dsym')
+        self.long_long_type(self.exe_name)
 
     def test_long_long_type_with_dwarf(self):
         """Test that 'long long'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': 'long_long_type_dwarf'}
+        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_long_type('long_long_type_dwarf')
+        self.long_long_type(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_long_long_type_with_dsym(self):
         """Test that 'unsigned long long'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': 'unsigned_long_long_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_long_type('unsigned_long_long_type_dsym')
+        self.unsigned_long_long_type(self.exe_name)
 
     def test_unsigned_long_long_type_with_dwarf(self):
         """Test that 'unsigned long long'-type variables are displayed correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': 'unsigned_long_long_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_long_type('unsigned_long_long_type_dwarf')
+        self.unsigned_long_long_type(self.exe_name)
 
     def char_type(self, exe_name):
         """Test that char-type variables are displayed correctly."""

Modified: lldb/trunk/test/types/TestIntegerTypesExpr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestIntegerTypesExpr.py?rev=133749&r1=133748&r2=133749&view=diff
==============================================================================
--- lldb/trunk/test/types/TestIntegerTypesExpr.py (original)
+++ lldb/trunk/test/types/TestIntegerTypesExpr.py Thu Jun 23 15:10:23 2011
@@ -14,122 +14,122 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_char_type_with_dsym(self):
         """Test that char-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'char.cpp', 'EXE': 'char_type_dsym'}
+        d = {'CXX_SOURCES': 'char.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.char_type_expr('char_type_dsym')
+        self.char_type_expr(self.exe_name)
 
     def test_char_type_with_dwarf(self):
         """Test that char-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'char.cpp', 'EXE': 'char_type_dwarf'}
+        d = {'CXX_SOURCES': 'char.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.char_type_expr('char_type_dwarf')
+        self.char_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_char_type_with_dsym(self):
         """Test that 'unsigned_char'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': 'unsigned_char_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_char_type_expr('unsigned_char_type_dsym')
+        self.unsigned_char_type_expr(self.exe_name)
 
     def test_unsigned_char_type_with_dwarf(self):
         """Test that 'unsigned char'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': 'unsigned_char_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_char.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_char_type_expr('unsigned_char_type_dwarf')
+        self.unsigned_char_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_short_type_with_dsym(self):
         """Test that short-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'short.cpp', 'EXE': 'short_type_dsym'}
+        d = {'CXX_SOURCES': 'short.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.short_type_expr('short_type_dsym')
+        self.short_type_expr(self.exe_name)
 
     def test_short_type_with_dwarf(self):
         """Test that short-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'short.cpp', 'EXE': 'short_type_dwarf'}
+        d = {'CXX_SOURCES': 'short.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.short_type_expr('short_type_dwarf')
+        self.short_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_short_type_with_dsym(self):
         """Test that 'unsigned_short'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': 'unsigned_short_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_short_type_expr('unsigned_short_type_dsym')
+        self.unsigned_short_type_expr(self.exe_name)
 
     def test_unsigned_short_type_with_dwarf(self):
         """Test that 'unsigned short'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': 'unsigned_short_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_short.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_short_type_expr('unsigned_short_type_dwarf')
+        self.unsigned_short_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_int_type_with_dsym(self):
         """Test that int-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'int.cpp', 'EXE': 'int_type_dsym'}
+        d = {'CXX_SOURCES': 'int.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.int_type_expr('int_type_dsym')
+        self.int_type_expr(self.exe_name)
 
     def test_int_type_with_dwarf(self):
         """Test that int-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'int.cpp', 'EXE': 'int_type_dwarf'}
+        d = {'CXX_SOURCES': 'int.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.int_type_expr('int_type_dwarf')
+        self.int_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_int_type_with_dsym(self):
         """Test that 'unsigned_int'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': 'unsigned_int_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_int_type_expr('unsigned_int_type_dsym')
+        self.unsigned_int_type_expr(self.exe_name)
 
     def test_unsigned_int_type_with_dwarf(self):
         """Test that 'unsigned int'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': 'unsigned_int_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_int.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_int_type_expr('unsigned_int_type_dwarf')
+        self.unsigned_int_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_long_type_with_dsym(self):
         """Test that long-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'long.cpp', 'EXE': 'long_type_dsym'}
+        d = {'CXX_SOURCES': 'long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_type_expr('long_type_dsym')
+        self.long_type_expr(self.exe_name)
 
     def test_long_type_with_dwarf(self):
         """Test that long-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'long.cpp', 'EXE': 'long_type_dwarf'}
+        d = {'CXX_SOURCES': 'long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_type_expr('long_type_dwarf')
+        self.long_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_long_type_with_dsym(self):
         """Test that 'unsigned long'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': 'unsigned_long_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_type_expr('unsigned_long_type_dsym')
+        self.unsigned_long_type_expr(self.exe_name)
 
     def test_unsigned_long_type_with_dwarf(self):
         """Test that 'unsigned long'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': 'unsigned_long_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_type_expr('unsigned_long_type_dwarf')
+        self.unsigned_long_type_expr(self.exe_name)
 
     # rdar://problem/8482903
     # test suite failure for types dir -- "long long" and "unsigned long long"
@@ -137,32 +137,32 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_long_long_type_with_dsym(self):
         """Test that 'long long'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': 'long_long_type_dsym'}
+        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_long_type_expr('long_long_type_dsym')
+        self.long_long_type_expr(self.exe_name)
 
     def test_long_long_type_with_dwarf(self):
         """Test that 'long long'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': 'long_long_type_dwarf'}
+        d = {'CXX_SOURCES': 'long_long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.long_long_type_expr('long_long_type_dwarf')
+        self.long_long_type_expr(self.exe_name)
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_unsigned_long_long_type_with_dsym(self):
         """Test that 'unsigned long long'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': 'unsigned_long_long_type_dsym'}
+        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': self.exe_name}
         self.buildDsym(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_long_type_expr('unsigned_long_long_type_dsym')
+        self.unsigned_long_long_type_expr(self.exe_name)
 
     def test_unsigned_long_long_type_with_dwarf(self):
         """Test that 'unsigned long long'-type variable expressions are evaluated correctly."""
-        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': 'unsigned_long_long_type_dwarf'}
+        d = {'CXX_SOURCES': 'unsigned_long_long.cpp', 'EXE': self.exe_name}
         self.buildDwarf(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        self.unsigned_long_long_type_expr('unsigned_long_long_type_dwarf')
+        self.unsigned_long_long_type_expr(self.exe_name)
 
     def char_type_expr(self, exe_name):
         """Test that char-type variable expressions are evaluated correctly."""





More information about the lldb-commits mailing list