1 files changed, 8 insertions, 33 deletions
diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py
index 1ae77fc959e..090b31950e8 100644
--- a/lldb/test/lang/c/bitfields/TestBitfields.py
+++ b/lldb/test/lang/c/bitfields/TestBitfields.py
@@ -9,45 +9,17 @@ import lldbutil
 class BitfieldsTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
-
-    @skipUnlessDarwin
-    @dsym_test
-    def test_with_dsym_and_run_command(self):
-        """Test 'frame variable ...' on a variable with bitfields."""
-        self.buildDsym()
-        self.bitfields_variable()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_with_dsym_and_python_api(self):
-        """Use Python APIs to inspect a bitfields variable."""
-        self.buildDsym()
-        self.bitfields_variable_python()
-
-    @dwarf_test
-    @skipIfWindows # BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)
-    def test_with_dwarf_and_run_command(self):
-        """Test 'frame variable ...' on a variable with bitfields."""
-        self.buildDwarf()
-        self.bitfields_variable()
-
-    @python_api_test
-    @dwarf_test
-    @skipIfWindows # BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)
-    def test_with_dwarf_and_python_api(self):
-        """Use Python APIs to inspect a bitfields variable."""
-        self.buildDwarf()
-        self.bitfields_variable_python()
-
+    
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
-    def bitfields_variable(self):
+    @skipIfWindows # BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)
+    def test_and_run_command(self):
         """Test 'frame variable ...' on a variable with bitfields."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
@@ -120,8 +92,11 @@ class BitfieldsTestCase(TestBase):
         self.expect("expr (more_bits.d)", VARIABLES_DISPLAYED_CORRECTLY,
             substrs = ['uint8_t', '\\0'])
 
-    def bitfields_variable_python(self):
+    @python_api_test
+    @skipIfWindows # BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)
+    def test_and_python_api(self):
         """Use Python APIs to inspect a bitfields variable."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)