[Dictionary] Rewrite the test added in r327587 as an inline test.

Until we have a better story for putting commands and check lines
in the same file (they're currently ignored), it seems that inline
tests are actually more concise and easier to understand.
Too bad we have still some python boilerplate, but that's not
really substantial so we can live with it.

Thanks to Fred for pointing out and Jim for explaining me how
to use the inline test format.

<rdar://problem/34806516>

llvm-svn: 327592

diff --git a/lldb/lit/DataFormatters/Inputs/NSDict.commands b/lldb/lit/DataFormatters/Inputs/NSDict.commands
deleted file mode 100644 (file)
index 2f03dae..0000000
--- a/lldb/lit/DataFormatters/Inputs/NSDict.commands
+++ /dev/null
@@ -1,3 +0,0 @@
-breakpoint set --file NSDict.m --line 8
-run
-frame var

diff --git a/lldb/lit/DataFormatters/Inputs/NSDict.m b/lldb/lit/DataFormatters/Inputs/NSDict.m
deleted file mode 100644 (file)
index efc96fd..0000000
--- a/lldb/lit/DataFormatters/Inputs/NSDict.m
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <Foundation/Foundation.h>
-
-int main(void)
-{
-  NSDictionary *emptyDictionary = [[NSDictionary alloc] init];
-  NSMutableDictionary *mutableDictionary = [NSMutableDictionary dictionary];
-  NSDictionary *dictionary = @{ @"key": @{} };
-  return 0;
-}

diff --git a/lldb/lit/DataFormatters/TestEmptyDictionary.test b/lldb/lit/DataFormatters/TestEmptyDictionary.test
deleted file mode 100644 (file)
index c9e6a0c..0000000
--- a/lldb/lit/DataFormatters/TestEmptyDictionary.test
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test that foundation NSDictionary0 is formatted correctly (the summary).
-# Foundation is only available on Darwin so just restrict the test to run there.
-# REQUIRES: darwin
-# RUN: %cc %p/Inputs/NSDict.m -framework Foundation -g -o %t && %lldb -b \
-# RUN:  -s %p/Inputs/NSDict.commands -- %t 2>&1 | FileCheck %s
-
-# CHECK: (__NSDictionary0 *) emptyDictionary = {{.*}} 0 key/value pairs

diff --git a/lldb/lit/DataFormatters/lit.local.cfg b/lldb/lit/DataFormatters/lit.local.cfg
deleted file mode 100644 (file)
index df9b335..0000000
--- a/lldb/lit/DataFormatters/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test']

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py
new file mode 100644 (file)
index 0000000..8049051
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/TestNSDictionary0.py
@@ -0,0 +1,6 @@
+from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
+
+lldbinline.MakeInlineTest(
+    __file__, globals(), [
+        decorators.skipIfFreeBSD, decorators.skipIfLinux, decorators.skipIfWindows])

diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/main.m
new file mode 100644 (file)
index 0000000..14a792b
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-foundation-dictionary-empty/main.m
@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+
+int main(void)
+{
+  NSDictionary *emptyDictionary = [[NSDictionary alloc] init];
+  return 0; //% self.expect("frame var emptyDictionary", substrs = ["0 key/value pairs"]);
+}