12 files changed, 0 insertions, 73 deletions
diff --git a/test/Modules/macro-reexport/a1.h b/test/Modules/macro-reexport/a1.h
deleted file mode 100644
index 39933315f7ee..000000000000
--- a/test/Modules/macro-reexport/a1.h
+++ /dev/null
@@ -1 +0,0 @@
-#define assert(x) a
diff --git a/test/Modules/macro-reexport/a2.h b/test/Modules/macro-reexport/a2.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/test/Modules/macro-reexport/a2.h
+++ /dev/null
diff --git a/test/Modules/macro-reexport/b1.h b/test/Modules/macro-reexport/b1.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/test/Modules/macro-reexport/b1.h
+++ /dev/null
diff --git a/test/Modules/macro-reexport/b2.h b/test/Modules/macro-reexport/b2.h
deleted file mode 100644
index 26150458d353..000000000000
--- a/test/Modules/macro-reexport/b2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "a2.h"
-#define assert(x) b
diff --git a/test/Modules/macro-reexport/c1.h b/test/Modules/macro-reexport/c1.h
deleted file mode 100644
index b63c278577f6..000000000000
--- a/test/Modules/macro-reexport/c1.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "b1.h"
-#define assert(x) c
diff --git a/test/Modules/macro-reexport/d1.h b/test/Modules/macro-reexport/d1.h
deleted file mode 100644
index 99abd2481597..000000000000
--- a/test/Modules/macro-reexport/d1.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "c1.h"
-#undef assert
-#define assert(x) d
diff --git a/test/Modules/macro-reexport/d2.h b/test/Modules/macro-reexport/d2.h
deleted file mode 100644
index 688f2d98a13b..000000000000
--- a/test/Modules/macro-reexport/d2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "b2.h"
diff --git a/test/Modules/macro-reexport/e1.h b/test/Modules/macro-reexport/e1.h
deleted file mode 100644
index 6c6829df3654..000000000000
--- a/test/Modules/macro-reexport/e1.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "c1.h"
-#undef assert
diff --git a/test/Modules/macro-reexport/e2.h b/test/Modules/macro-reexport/e2.h
deleted file mode 100644
index 7bc0b4972d2c..000000000000
--- a/test/Modules/macro-reexport/e2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "d1.h"
-#undef assert
diff --git a/test/Modules/macro-reexport/f1.h b/test/Modules/macro-reexport/f1.h
deleted file mode 100644
index f8f6502a90c6..000000000000
--- a/test/Modules/macro-reexport/f1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "e1.h"
-#include "d1.h"
-
diff --git a/test/Modules/macro-reexport/macro-reexport.cpp b/test/Modules/macro-reexport/macro-reexport.cpp
deleted file mode 100644
index af2ec847ce07..000000000000
--- a/test/Modules/macro-reexport/macro-reexport.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// RUN: rm -rf %t
-// RUN: %clang_cc1 -fsyntax-only -DC1 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DC1 -I. -fmodules %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD1 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD1 -I. -fmodules %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD2 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD2 -I. -fmodules %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DF1 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DF1 -I. -fmodules %s -fmodules-cache-path=%t -verify
-
-#if defined(F1)
-#include "f1.h"
-void f() { return assert(true); } // expected-error {{undeclared identifier 'd'}}
-#include "e2.h" // undefines d1's macro
-void g() { return assert(true); } // expected-error {{undeclared identifier 'assert'}}
-#elif defined(D1)
-#include "e1.h" // undefines c1's macro but not d1's macro
-#include "d1.h"
-void f() { return assert(true); } // expected-error {{undeclared identifier 'd'}}
-#include "e2.h" // undefines d1's macro
-void g() { return assert(true); } // expected-error {{undeclared identifier 'assert'}}
-#elif defined(D2)
-#include "d2.h"
-void f() { return assert(true); } // expected-error {{undeclared identifier 'b'}}
-#else
-// e2 undefines d1's macro, which overrides c1's macro.
-#include "e2.h"
-#include "c1.h"
-void f() { return assert(true); } // expected-error {{undeclared identifier 'assert'}}
-#endif
diff --git a/test/Modules/macro-reexport/module.modulemap b/test/Modules/macro-reexport/module.modulemap
deleted file mode 100644
index 896bda041c30..000000000000
--- a/test/Modules/macro-reexport/module.modulemap
+++ /dev/null
@@ -1,23 +0,0 @@
-module b {
-  module b2 { header "b2.h" export * }
-  module b1 { header "b1.h" export * }
-}
-module a {
-  module a1 { header "a1.h" export * }
-  module a2 { header "a2.h" export * }
-}
-module c {
-  module c1 { header "c1.h" export * }
-}
-module d {
-  module d1 { header "d1.h" export * }
-  module d2 { header "d2.h" export * }
-}
-module e {
-  module e1 { header "e1.h" export * }
-  module e2 { header "e2.h" export * }
-}
-module f {
-  module f1 { header "f1.h" export * }
-  module f2 { header "f2.h" export * }
-}