9 files changed, 36 insertions, 0 deletions
diff --git a/clang/test/Import/clang-flags/Inputs/S.c b/clang/test/Import/clang-flags/Inputs/S.c
new file mode 100644
index 00000000000..742dac8a35b
--- /dev/null
+++ b/clang/test/Import/clang-flags/Inputs/S.c
@@ -0,0 +1,2 @@
+STRUCT S {
+};
diff --git a/clang/test/Import/clang-flags/test.c b/clang/test/Import/clang-flags/test.c
new file mode 100644
index 00000000000..7a19ea7ff64
--- /dev/null
+++ b/clang/test/Import/clang-flags/test.c
@@ -0,0 +1,5 @@
+// RUN: clang-import-test -import %S/Inputs/S.c -expression %s -Xcc -DSTRUCT=struct
+void expr() {
+  STRUCT S MyS;
+  void *MyPtr = &MyS;
+}
diff --git a/clang/test/Import/empty-struct/Inputs/S.c b/clang/test/Import/empty-struct/Inputs/S.c
new file mode 100644
index 00000000000..8c90352bc46
--- /dev/null
+++ b/clang/test/Import/empty-struct/Inputs/S.c
@@ -0,0 +1,2 @@
+struct S {
+};
diff --git a/clang/test/Import/empty-struct/test.c b/clang/test/Import/empty-struct/test.c
new file mode 100644
index 00000000000..d51a69706dc
--- /dev/null
+++ b/clang/test/Import/empty-struct/test.c
@@ -0,0 +1,5 @@
+// RUN: clang-import-test -import %S/Inputs/S.c -expression %s
+void expr() {
+  struct S MyS;
+  void *MyPtr = &MyS;
+}
diff --git a/clang/test/Import/error-in-expression/Inputs/S.c b/clang/test/Import/error-in-expression/Inputs/S.c
new file mode 100644
index 00000000000..8c90352bc46
--- /dev/null
+++ b/clang/test/Import/error-in-expression/Inputs/S.c
@@ -0,0 +1,2 @@
+struct S {
+};
diff --git a/clang/test/Import/error-in-expression/test.c b/clang/test/Import/error-in-expression/test.c
new file mode 100644
index 00000000000..65d3b4a5dcb
--- /dev/null
+++ b/clang/test/Import/error-in-expression/test.c
@@ -0,0 +1,6 @@
+// RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
+// CHECK: {{.*}}no viable conversion{{.*}}
+void expr() {
+  struct S MyS;
+  void *MyPtr = MyS;
+}
diff --git a/clang/test/Import/error-in-import/Inputs/S.c b/clang/test/Import/error-in-import/Inputs/S.c
new file mode 100644
index 00000000000..23ca763f679
--- /dev/null
+++ b/clang/test/Import/error-in-import/Inputs/S.c
@@ -0,0 +1,2 @@
+struct S [
+];
diff --git a/clang/test/Import/error-in-import/test.c b/clang/test/Import/error-in-import/test.c
new file mode 100644
index 00000000000..197d4e30426
--- /dev/null
+++ b/clang/test/Import/error-in-import/test.c
@@ -0,0 +1,6 @@
+// RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
+// CHECK: {{.*}}expected unqualified-id{{.*}}
+void expr() {
+  struct S MyS;
+  void *MyPtr = &MyS;
+}
diff --git a/clang/test/Import/missing-import/test.c b/clang/test/Import/missing-import/test.c
new file mode 100644
index 00000000000..acf6389cc5f
--- /dev/null
+++ b/clang/test/Import/missing-import/test.c
@@ -0,0 +1,6 @@
+// RUN: not clang-import-test -import %S/Inputs/S.c -expression %s 2>&1 | FileCheck %s
+// CHECK: {{.*}}Couldn't open{{.*}}Inputs/S.c{{.*}}
+void expr() {
+  struct S MyS;
+  void *MyPtr = &MyS;
+}