1 files changed, 4 insertions, 15 deletions
diff --git a/lldb/test/lang/cpp/virtual/TestVirtual.py b/lldb/test/lang/cpp/virtual/TestVirtual.py
index 797afaf8c60..0904cfc0c83 100644
--- a/lldb/test/lang/cpp/virtual/TestVirtual.py
+++ b/lldb/test/lang/cpp/virtual/TestVirtual.py
@@ -22,19 +22,6 @@ class CppVirtualMadness(TestBase):
     # Assert message.
     PRINTF_OUTPUT_GROKKED = "The printf output from compiled code is parsed correctly"
 
-    @skipIfWindows # Process::GetSTDOUT unsupported on Windows.  This test should be re-written to use stdout re-direction
-    @skipUnlessDarwin
-    def test_virtual_madness_dsym(self):
-        """Test that expression works correctly with virtual inheritance as well as virtual function."""
-        self.buildDsym()
-        self.virtual_madness_test()
-
-    @expectedFailureIcc('llvm.org/pr16808') # lldb does not call the correct virtual function with icc
-    def test_virtual_madness_dwarf(self):
-        """Test that expression works correctly with virtual inheritance as well as virtual function."""
-        self.buildDwarf()
-        self.virtual_madness_test()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -42,8 +29,10 @@ class CppVirtualMadness(TestBase):
         self.source = 'main.cpp'
         self.line = line_number(self.source, '// Set first breakpoint here.')
 
-    def virtual_madness_test(self):
-        """Test that variable expressions with basic types are evaluated correctly."""
+    @expectedFailureIcc('llvm.org/pr16808') # lldb does not call the correct virtual function with icc
+    def test_virtual_madness(self):
+        """Test that expression works correctly with virtual inheritance as well as virtual function."""
+        self.build()
 
         # Bring the program to the point where we can issue a series of
         # 'expression' command to compare against the golden output.