From 54ed7e18f2b139d71888e4353d30374480f726ed Mon Sep 17 00:00:00 2001 From: Enrico Granata Date: Tue, 25 Aug 2015 23:55:10 +0000 Subject: [PATCH] Rename all functionalities/data-formatter test case with radar bug numbers in them to more meaningful names llvm-svn: 245993 --- .../{rdar-11628688 => boolreference}/Makefile | 0 .../TestFormattersBoolRefPtr.py | 0 .../{rdar-11773899 => boolreference}/main.mm | 0 .../Makefile | 0 .../TestCompactVectors.py} | 3 +- .../main.cpp | 0 .../Makefile | 0 .../TestFormattersOneIsSingular.py | 0 .../main.m | 0 .../Makefile | 0 .../TestPtrToArrayFormatting.py} | 3 +- .../main.cpp | 0 .../{rdar-10887661 => hexcaps}/Makefile | 0 .../TestDataFormatterHexCaps.py} | 3 +- .../{rdar-10449092 => hexcaps}/main.cpp | 0 .../{rdar-11988289 => nsarraysynth}/Makefile | 0 .../TestNSArraySynthetic.py} | 2 +- .../{rdar-11086338 => nsarraysynth}/main.m | 0 .../Makefile | 0 .../TestNSDictionarySynthetic.py} | 2 +- .../main.m | 0 .../{rdar-3534688 => nssetsynth}/Makefile | 0 .../TestNSSetSynthetic.py} | 2 +- .../{rdar-12529957 => nssetsynth}/main.m | 0 .../Makefile | 0 .../TestFormattersBoolRefPtr.py | 0 .../main.mm | 0 .../rdar-9973865/Test-rdar-9973865.py | 77 ------------------- .../data-formatter/rdar-9973865/main.cpp | 30 -------- .../data-formatter/rdar-9973992/Makefile | 5 -- .../Makefile | 0 .../Test-rdar-9974002.py | 0 .../main.cpp | 0 .../{rdar-13338477 => synthcapping}/Makefile | 0 .../TestSyntheticCapping.py} | 4 +- .../fooSynthProvider.py | 0 .../{rdar-10887661 => synthcapping}/main.cpp | 0 .../{rdar-12437442 => synthupdate}/Makefile | 0 .../TestSyntheticFilterRecompute.py} | 2 +- .../{rdar-12437442 => synthupdate}/main.m | 0 .../Makefile | 0 .../TestVarInAggregateMisuse.py} | 6 +- .../main.cpp | 0 43 files changed, 11 insertions(+), 128 deletions(-) rename lldb/test/functionalities/data-formatter/{rdar-11628688 => boolreference}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-11773899 => boolreference}/TestFormattersBoolRefPtr.py (100%) rename lldb/test/functionalities/data-formatter/{rdar-11773899 => boolreference}/main.mm (100%) rename lldb/test/functionalities/data-formatter/{rdar-10642615 => compactvectors}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-10642615/Test-rdar-10642615.py => compactvectors/TestCompactVectors.py} (96%) rename lldb/test/functionalities/data-formatter/{rdar-10642615 => compactvectors}/main.cpp (100%) rename lldb/test/functionalities/data-formatter/{rdar-11086338 => data-formatter-proper-plurals}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-3534688 => data-formatter-proper-plurals}/TestFormattersOneIsSingular.py (100%) rename lldb/test/functionalities/data-formatter/{rdar-3534688 => data-formatter-proper-plurals}/main.m (100%) rename lldb/test/functionalities/data-formatter/{rdar-10449092 => data-formatter-ptr-to-array}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-13338477/Test-rdar-13338477.py => data-formatter-ptr-to-array/TestPtrToArrayFormatting.py} (95%) rename lldb/test/functionalities/data-formatter/{rdar-13338477 => data-formatter-ptr-to-array}/main.cpp (100%) rename lldb/test/functionalities/data-formatter/{rdar-10887661 => hexcaps}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-10449092/Test-rdar-10449092.py => hexcaps/TestDataFormatterHexCaps.py} (97%) rename lldb/test/functionalities/data-formatter/{rdar-10449092 => hexcaps}/main.cpp (100%) rename lldb/test/functionalities/data-formatter/{rdar-11988289 => nsarraysynth}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-11086338/TestRdar11086338.py => nsarraysynth/TestNSArraySynthetic.py} (98%) rename lldb/test/functionalities/data-formatter/{rdar-11086338 => nsarraysynth}/main.m (100%) rename lldb/test/functionalities/data-formatter/{rdar-12529957 => nsdictionarysynth}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-11988289/TestRdar 11988289.py => nsdictionarysynth/TestNSDictionarySynthetic.py} (98%) rename lldb/test/functionalities/data-formatter/{rdar-11988289 => nsdictionarysynth}/main.m (100%) rename lldb/test/functionalities/data-formatter/{rdar-3534688 => nssetsynth}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-12529957/TestRdar12529957.py => nssetsynth/TestNSSetSynthetic.py} (98%) rename lldb/test/functionalities/data-formatter/{rdar-12529957 => nssetsynth}/main.m (100%) rename lldb/test/functionalities/data-formatter/{rdar-11773899 => ostypeformatting}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-11628688 => ostypeformatting}/TestFormattersBoolRefPtr.py (100%) rename lldb/test/functionalities/data-formatter/{rdar-11628688 => ostypeformatting}/main.mm (100%) delete mode 100644 lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py delete mode 100644 lldb/test/functionalities/data-formatter/rdar-9973865/main.cpp delete mode 100644 lldb/test/functionalities/data-formatter/rdar-9973992/Makefile rename lldb/test/functionalities/data-formatter/{rdar-9974002 => summary-string-onfail}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-9974002 => summary-string-onfail}/Test-rdar-9974002.py (100%) rename lldb/test/functionalities/data-formatter/{rdar-9974002 => summary-string-onfail}/main.cpp (100%) rename lldb/test/functionalities/data-formatter/{rdar-13338477 => synthcapping}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-10887661/TestRdar10887661.py => synthcapping/TestSyntheticCapping.py} (97%) rename lldb/test/functionalities/data-formatter/{rdar-10887661 => synthcapping}/fooSynthProvider.py (100%) rename lldb/test/functionalities/data-formatter/{rdar-10887661 => synthcapping}/main.cpp (100%) rename lldb/test/functionalities/data-formatter/{rdar-12437442 => synthupdate}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-12437442/TestRdar12437442.py => synthupdate/TestSyntheticFilterRecompute.py} (98%) rename lldb/test/functionalities/data-formatter/{rdar-12437442 => synthupdate}/main.m (100%) rename lldb/test/functionalities/data-formatter/{rdar-9973865 => var-in-aggregate-misuse}/Makefile (100%) rename lldb/test/functionalities/data-formatter/{rdar-9973992/Test-rdar-9973992.py => var-in-aggregate-misuse/TestVarInAggregateMisuse.py} (94%) rename lldb/test/functionalities/data-formatter/{rdar-9973992 => var-in-aggregate-misuse}/main.cpp (100%) diff --git a/lldb/test/functionalities/data-formatter/rdar-11628688/Makefile b/lldb/test/functionalities/data-formatter/boolreference/Makefile similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11628688/Makefile rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11773899/main.mm rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10642615/Makefile rename to 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 similarity index 96% rename from lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py rename to lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py index b4f6294c11a8..35a5ebe7ec65 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10642615/main.cpp rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11086338/Makefile rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-3534688/main.m rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10449092/Makefile rename to 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 similarity index 95% rename from lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py rename to lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py index 5a2acda18a3e..5f8997984f5c 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-13338477/main.cpp rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10887661/Makefile rename to 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 similarity index 97% rename from lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py rename to lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py index ac8757f6cfef..de283da9c6c3 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10449092/main.cpp rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11988289/Makefile rename to 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 similarity index 98% rename from lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py rename to lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py index 40bd599617fb..08260c5e787c 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11086338/main.m rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-12529957/Makefile rename to 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 similarity index 98% rename from lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py rename to lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py index ae1b83bd39b5..032ca1cf7a56 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11988289/main.m rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-3534688/Makefile rename to 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 similarity index 98% rename from lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py rename to lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py index 83a36ecda557..de1138d2a45a 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-12529957/main.m rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11773899/Makefile rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-11628688/main.mm rename to 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 9470fbf2393d..000000000000 --- 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 cbaae2a1f201..000000000000 --- 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 -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 314f1cb2f077..000000000000 --- 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-9974002/Makefile rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-9974002/main.cpp rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-13338477/Makefile rename to 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 similarity index 97% rename from lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py rename to lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py index 67aa08de6b83..b054d487b018 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10887661/fooSynthProvider.py rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-10887661/main.cpp rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-12437442/Makefile rename to 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 similarity index 98% rename from lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py rename to lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py index c96f38b08036..fd24740c3cd1 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-12437442/main.m rename to 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-9973865/Makefile rename to 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 similarity index 94% rename from lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py rename to lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py index 5f31904279c2..ffa2fc9177ca 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 similarity index 100% rename from lldb/test/functionalities/data-formatter/rdar-9973992/main.cpp rename to lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp