43 files changed, 11 insertions, 128 deletions
diff --git a/lldb/test/functionalities/data-formatter/rdar-11628688/Makefile b/lldb/test/functionalities/data-formatter/boolreference/Makefile
index 261658b10ae..261658b10ae 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11628688/Makefile
+++ b/lldb/test/functionalities/data-formatter/boolreference/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
index 092737b3ac2..092737b3ac2 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py
+++ b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
diff --git a/lldb/test/functionalities/data-formatter/rdar-11773899/main.mm b/lldb/test/functionalities/data-formatter/boolreference/main.mm
index a2461fd9da9..a2461fd9da9 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11773899/main.mm
+++ b/lldb/test/functionalities/data-formatter/boolreference/main.mm
diff --git a/lldb/test/functionalities/data-formatter/rdar-10642615/Makefile b/lldb/test/functionalities/data-formatter/compactvectors/Makefile
index 9b06ad7d705..9b06ad7d705 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10642615/Makefile
+++ b/lldb/test/functionalities/data-formatter/compactvectors/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
index b4f6294c11a..35a5ebe7ec6 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py
+++ b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
@@ -8,9 +8,8 @@ import lldb
 from lldbtest import *
 import lldbutil
 
-class Radar10642615DataFormatterTestCase(TestBase):
+class CompactVectorsFormattingTestCase(TestBase):
 
-    # test for rdar://problem/10642615 ()
     mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
diff --git a/lldb/test/functionalities/data-formatter/rdar-10642615/main.cpp b/lldb/test/functionalities/data-formatter/compactvectors/main.cpp
index bbbd823ec31..bbbd823ec31 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10642615/main.cpp
+++ b/lldb/test/functionalities/data-formatter/compactvectors/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/rdar-11086338/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11086338/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
index b3cbeb43e10..b3cbeb43e10 100644
--- a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
diff --git a/lldb/test/functionalities/data-formatter/rdar-3534688/main.m b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m
index 7204d3c7b20..7204d3c7b20 100644
--- a/lldb/test/functionalities/data-formatter/rdar-3534688/main.m
+++ b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m
diff --git a/lldb/test/functionalities/data-formatter/rdar-10449092/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10449092/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 5a2acda18a3..5f8997984f5 100644
--- a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
@@ -8,9 +8,8 @@ import lldb
 from lldbtest import *
 import lldbutil
 
-class Radar13338477DataFormatterTestCase(TestBase):
+class PtrToArrayDataFormatterTestCase(TestBase):
 
-    # test for rdar://problem/13338477 ()
     mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
diff --git a/lldb/test/functionalities/data-formatter/rdar-13338477/main.cpp b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
index 15fa5614d7f..15fa5614d7f 100644
--- a/lldb/test/functionalities/data-formatter/rdar-13338477/main.cpp
+++ b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/rdar-10887661/Makefile b/lldb/test/functionalities/data-formatter/hexcaps/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10887661/Makefile
+++ b/lldb/test/functionalities/data-formatter/hexcaps/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index ac8757f6cfe..de283da9c6c 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py
+++ b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -8,9 +8,8 @@ import lldb
 from lldbtest import *
 import lldbutil
 
-class Radar10449092DataFormatterTestCase(TestBase):
+class DataFormatterHexCapsTestCase(TestBase):
 
-    # test for rdar://problem/10449092 ()
     mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
diff --git a/lldb/test/functionalities/data-formatter/rdar-10449092/main.cpp b/lldb/test/functionalities/data-formatter/hexcaps/main.cpp
index 5ee113c17b2..5ee113c17b2 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10449092/main.cpp
+++ b/lldb/test/functionalities/data-formatter/hexcaps/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/rdar-11988289/Makefile b/lldb/test/functionalities/data-formatter/nsarraysynth/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11988289/Makefile
+++ b/lldb/test/functionalities/data-formatter/nsarraysynth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
index 40bd599617f..08260c5e787 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py
+++ b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
@@ -9,7 +9,7 @@ from lldbtest import *
 import datetime
 import lldbutil
 
-class DataFormatterRdar11086338TestCase(TestBase):
+class NSArraySyntheticTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
diff --git a/lldb/test/functionalities/data-formatter/rdar-11086338/main.m b/lldb/test/functionalities/data-formatter/nsarraysynth/main.m
index 1b4a6e03857..1b4a6e03857 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11086338/main.m
+++ b/lldb/test/functionalities/data-formatter/nsarraysynth/main.m
diff --git a/lldb/test/functionalities/data-formatter/rdar-12529957/Makefile b/lldb/test/functionalities/data-formatter/nsdictionarysynth/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/rdar-12529957/Makefile
+++ b/lldb/test/functionalities/data-formatter/nsdictionarysynth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
index ae1b83bd39b..032ca1cf7a5 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py
+++ b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
@@ -9,7 +9,7 @@ from lldbtest import *
 import datetime
 import lldbutil
 
-class DataFormatterRdar11988289TestCase(TestBase):
+class NSDictionarySyntheticTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
diff --git a/lldb/test/functionalities/data-formatter/rdar-11988289/main.m b/lldb/test/functionalities/data-formatter/nsdictionarysynth/main.m
index 62eed942d29..62eed942d29 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11988289/main.m
+++ b/lldb/test/functionalities/data-formatter/nsdictionarysynth/main.m
diff --git a/lldb/test/functionalities/data-formatter/rdar-3534688/Makefile b/lldb/test/functionalities/data-formatter/nssetsynth/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/rdar-3534688/Makefile
+++ b/lldb/test/functionalities/data-formatter/nssetsynth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
index 83a36ecda55..de1138d2a45 100644
--- a/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py
+++ b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
@@ -9,7 +9,7 @@ from lldbtest import *
 import datetime
 import lldbutil
 
-class DataFormatterRdar12529957TestCase(TestBase):
+class NSSetSyntheticTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
diff --git a/lldb/test/functionalities/data-formatter/rdar-12529957/main.m b/lldb/test/functionalities/data-formatter/nssetsynth/main.m
index 7bc49583606..7bc49583606 100644
--- a/lldb/test/functionalities/data-formatter/rdar-12529957/main.m
+++ b/lldb/test/functionalities/data-formatter/nssetsynth/main.m
diff --git a/lldb/test/functionalities/data-formatter/rdar-11773899/Makefile b/lldb/test/functionalities/data-formatter/ostypeformatting/Makefile
index 261658b10ae..261658b10ae 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11773899/Makefile
+++ b/lldb/test/functionalities/data-formatter/ostypeformatting/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersBoolRefPtr.py
index f0584c89ed2..f0584c89ed2 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py
+++ b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersBoolRefPtr.py
diff --git a/lldb/test/functionalities/data-formatter/rdar-11628688/main.mm b/lldb/test/functionalities/data-formatter/ostypeformatting/main.mm
index 8d22659374a..8d22659374a 100644
--- a/lldb/test/functionalities/data-formatter/rdar-11628688/main.mm
+++ b/lldb/test/functionalities/data-formatter/ostypeformatting/main.mm
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
deleted file mode 100644
index 9470fbf2393..00000000000
--- a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
+++ /dev/null
@@ -1,77 +0,0 @@
-"""
-Test lldb data formatter subsystem.
-"""
-
-import os, time
-import unittest2
-import lldb
-from lldbtest import *
-import lldbutil
-
-class Radar9973865DataFormatterTestCase(TestBase):
-
-    # test for rdar://problem/9973865 (If you use "${var}" in the summary string for an aggregate type, the summary doesn't print for a pointer to that type)
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipUnlessDarwin
-    @dsym_test
-    def test_with_dsym_and_run_command(self):
-        """Test data formatter commands."""
-        self.buildDsym()
-        self.data_formatter_commands()
-
-    @dwarf_test
-    def test_with_dwarf_and_run_command(self):
-        """Test data formatter commands."""
-
-        self.buildDwarf()
-        self.data_formatter_commands()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break at.
-        self.line = line_number('main.cpp', '// Set break point at this line.')
-
-    def data_formatter_commands(self):
-        """Test that that file and class static variables display correctly."""
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
-
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
-
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # The stop reason of the thread should be breakpoint.
-        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-            substrs = ['stopped',
-                       'stop reason = breakpoint'])
-
-        # This is the function to remove the custom formats in order to have a
-        # clean slate for the next test case.
-        def cleanup():
-            self.runCmd('type summary clear', check=False)
-
-        # Execute the cleanup function during test case tear down.
-        self.addTearDownHook(cleanup)
-
-        self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS ${var}\" Summarize")
-        
-        self.expect('frame variable mine_ptr',
-                substrs = ['SUMMARY SUCCESS summarize_ptr_t @ '])
-
-        self.expect('frame variable *mine_ptr',
-                substrs = ['SUMMARY SUCCESS summarize_t @'])
-
-        self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS ${var.first}\" Summarize")
-
-        self.expect('frame variable mine_ptr',
-                    substrs = ['SUMMARY SUCCESS 10'])
-
-        self.expect('frame variable *mine_ptr',
-                    substrs = ['SUMMARY SUCCESS 10'])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest2.main()
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/main.cpp b/lldb/test/functionalities/data-formatter/rdar-9973865/main.cpp
deleted file mode 100644
index cbaae2a1f20..00000000000
--- a/lldb/test/functionalities/data-formatter/rdar-9973865/main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <stdio.h>
-struct Summarize
-{
-    int first;
-    int second;
-};
-
-typedef Summarize summarize_t;
-typedef summarize_t *summarize_ptr_t;
-
-summarize_t global_mine = {30, 40};
-
-int
-main()
-{
-    summarize_t mine = {10, 20};
-    summarize_ptr_t mine_ptr = &mine;
-    printf ("Summarize: first: %d second: %d and address: 0x%p\n", mine.first, mine.second, mine_ptr); // Set break point at this line.
-    printf ("Global summarize: first: %d second: %d.\n", global_mine.first, global_mine.second);
-    return 0;
-}
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973992/Makefile b/lldb/test/functionalities/data-formatter/rdar-9973992/Makefile
deleted file mode 100644
index 314f1cb2f07..00000000000
--- a/lldb/test/functionalities/data-formatter/rdar-9973992/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/rdar-9974002/Makefile b/lldb/test/functionalities/data-formatter/summary-string-onfail/Makefile
index 04f39271f0c..04f39271f0c 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9974002/Makefile
+++ b/lldb/test/functionalities/data-formatter/summary-string-onfail/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py b/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
index 326edf1a5a9..326edf1a5a9 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py
+++ b/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
diff --git a/lldb/test/functionalities/data-formatter/rdar-9974002/main.cpp b/lldb/test/functionalities/data-formatter/summary-string-onfail/main.cpp
index 03a9f278b7e..03a9f278b7e 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9974002/main.cpp
+++ b/lldb/test/functionalities/data-formatter/summary-string-onfail/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/rdar-13338477/Makefile b/lldb/test/functionalities/data-formatter/synthcapping/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/rdar-13338477/Makefile
+++ b/lldb/test/functionalities/data-formatter/synthcapping/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index 67aa08de6b8..b054d487b01 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py
+++ b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
@@ -8,11 +8,10 @@ import lldb
 from lldbtest import *
 import lldbutil
 
-class Rdar10887661TestCase(TestBase):
+class SyntheticCappingTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # rdar://problem/10887661
     @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
@@ -20,7 +19,6 @@ class Rdar10887661TestCase(TestBase):
         self.buildDsym()
         self.capping_test_commands()
 
-    # rdar://problem/10887661
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Check for an issue where capping does not work because the Target pointer appears to be changing behind our backs."""
diff --git a/lldb/test/functionalities/data-formatter/rdar-10887661/fooSynthProvider.py b/lldb/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py
index fb95ac2b54d..fb95ac2b54d 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10887661/fooSynthProvider.py
+++ b/lldb/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py
diff --git a/lldb/test/functionalities/data-formatter/rdar-10887661/main.cpp b/lldb/test/functionalities/data-formatter/synthcapping/main.cpp
index b921915b91c..b921915b91c 100644
--- a/lldb/test/functionalities/data-formatter/rdar-10887661/main.cpp
+++ b/lldb/test/functionalities/data-formatter/synthcapping/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/rdar-12437442/Makefile b/lldb/test/functionalities/data-formatter/synthupdate/Makefile
index a8e1853a129..a8e1853a129 100644
--- a/lldb/test/functionalities/data-formatter/rdar-12437442/Makefile
+++ b/lldb/test/functionalities/data-formatter/synthupdate/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
index c96f38b0803..fd24740c3cd 100644
--- a/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py
+++ b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
@@ -9,7 +9,7 @@ from lldbtest import *
 import datetime
 import lldbutil
 
-class DataFormatterRdar12437442TestCase(TestBase):
+class SyntheticFilterRecomputingTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
diff --git a/lldb/test/functionalities/data-formatter/rdar-12437442/main.m b/lldb/test/functionalities/data-formatter/synthupdate/main.m
index a7e94d29d46..a7e94d29d46 100644
--- a/lldb/test/functionalities/data-formatter/rdar-12437442/main.m
+++ b/lldb/test/functionalities/data-formatter/synthupdate/main.m
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/Makefile b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
index 18c35a7d84a..18c35a7d84a 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9973865/Makefile
+++ b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
index 5f31904279c..ffa2fc9177c 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py
+++ b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
@@ -8,9 +8,8 @@ import lldb
 from lldbtest import *
 import lldbutil
 
-class Radar9973992DataFormatterTestCase(TestBase):
+class VarInAggregateMisuseTestCase(TestBase):
 
-    # test for rdar://problem/9973992 (What should we do for "${var}" in summaries of aggregate types?)
     mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
@@ -23,6 +22,7 @@ class Radar9973992DataFormatterTestCase(TestBase):
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""
+
         self.buildDwarf()
         self.data_formatter_commands()
 
@@ -68,7 +68,7 @@ class Radar9973992DataFormatterTestCase(TestBase):
 
         self.expect('frame variable *mine_ptr',
                     substrs = ['SUMMARY SUCCESS 10'])
-            
+
         self.runCmd("type summary add --summary-string \"${var}\" Summarize")
         self.runCmd("type summary add --summary-string \"${var}\" -e TwoSummarizes")
             
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973992/main.cpp b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
index 72c7e138205..72c7e138205 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9973992/main.cpp
+++ b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp