diff options
Diffstat (limited to 'test/Modules/preprocess-module.cpp')
| -rw-r--r-- | test/Modules/preprocess-module.cpp | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/test/Modules/preprocess-module.cpp b/test/Modules/preprocess-module.cpp index 000290fc971bb..b0cbac18e7807 100644 --- a/test/Modules/preprocess-module.cpp +++ b/test/Modules/preprocess-module.cpp @@ -29,15 +29,15 @@ // RUN: %clang_cc1 -fmodules -fmodule-file=%t/rewrite.pcm %s -I%t -verify -fno-modules-error-recovery -DREWRITE -DINCLUDE -I%S/Inputs/preprocess // Now try building the module when the header files are missing. -// RUN: cp %S/Inputs/preprocess/fwd.h %S/Inputs/preprocess/file.h %S/Inputs/preprocess/file2.h %S/Inputs/preprocess/module.modulemap %t +// RUN: cp %S/Inputs/preprocess/fwd.h %S/Inputs/preprocess/file.h %S/Inputs/preprocess/file2.h %S/Inputs/preprocess/other.h %S/Inputs/preprocess/module.modulemap %t // RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -I%t -x c++-module-map %t/module.modulemap -E -frewrite-includes -o %t/copy.ii -// RUN: rm %t/fwd.h %t/file.h %t/file2.h %t/module.modulemap +// RUN: rm %t/fwd.h %t/file.h %t/file2.h %t/other.h %t/module.modulemap // RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -x c++-module-map-cpp-output %t/copy.ii -emit-module -o %t/copy.pcm // Check that our module contains correct mapping information for the headers. -// RUN: cp %S/Inputs/preprocess/fwd.h %S/Inputs/preprocess/file.h %S/Inputs/preprocess/file2.h %S/Inputs/preprocess/module.modulemap %t +// RUN: cp %S/Inputs/preprocess/fwd.h %S/Inputs/preprocess/file.h %S/Inputs/preprocess/file2.h %S/Inputs/preprocess/other.h %S/Inputs/preprocess/module.modulemap %t // RUN: %clang_cc1 -fmodules -fmodule-file=%t/copy.pcm %s -I%t -verify -fno-modules-error-recovery -DCOPY -DINCLUDE -// RUN: rm %t/fwd.h %t/file.h %t/file2.h %t/module.modulemap +// RUN: rm %t/fwd.h %t/file.h %t/file2.h %t/other.h %t/module.modulemap // Check that we can preprocess from a .pcm file and that we get the same result as preprocessing from the original sources. // RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -I%S/Inputs/preprocess -x c++-module-map %S/Inputs/preprocess/module.modulemap -emit-module -o %t/file.pcm @@ -50,6 +50,10 @@ // RUN: %clang_cc1 -fmodules -fmodule-file=%t/file.rewrite.pcm %s -I%t -verify -fno-modules-error-recovery -DFILE_REWRITE // RUN: %clang_cc1 -fmodules -fmodule-file=%t/file.rewrite.pcm %s -I%t -verify -fno-modules-error-recovery -DFILE_REWRITE -DINCLUDE -I%S/Inputs/preprocess // +// Check that we can preprocess this user of the .pcm file. +// RUN: %clang_cc1 -fmodules -fmodule-file=%t/file.pcm %s -I%t -E -frewrite-imports -o %t/preprocess-module.ii +// RUN: %clang_cc1 -fmodules %t/preprocess-module.ii -verify -fno-modules-error-recovery -DFILE_REWRITE_FULL +// // Check that language / header search options are ignored when preprocessing from a .pcm file. // RUN: %clang_cc1 %t/file.pcm -E -frewrite-includes -o %t/file.rewrite.ii.2 // RUN: cmp %t/file.rewrite.ii %t/file.rewrite.ii.2 @@ -78,12 +82,15 @@ // REWRITE: #pragma clang module begin file // CHECK: # 1 "{{.*}}file.h" 1 // NO-REWRITE: #pragma clang module begin file -// NO-REWRITE: # 1 "{{.*}}file.h"{{$}} // -// CHECK: struct __FILE; +// REWRITE: #ifndef FILE_H +// REWRITE: #define FILE_H +// // CHECK: #pragma clang module import fwd /* clang {{-E|-frewrite-includes}}: implicit import // CHECK: typedef struct __FILE FILE; // +// REWRITE: #endif +// // REWRITE: #pragma clang module end // CHECK: # 2 "<module-includes>" 2 // NO-REWRITE: #pragma clang module end @@ -105,11 +112,16 @@ // REWRITE: #pragma clang module begin file // CHECK: # 1 "{{.*}}file.h" 1 // NO-REWRITE: #pragma clang module begin file -// NO-REWRITE: # 1 "{{.*}}file.h"{{$}} // -// CHECK: struct __FILE; -// CHECK: #pragma clang module import fwd /* clang {{-E|-frewrite-includes}}: implicit import -// CHECK: typedef struct __FILE FILE; +// REWRITE: #ifndef FILE_H +// REWRITE: #define FILE_H +// REWRITE: #if 0 +// REWRITE: #include "fwd.h" +// REWRITE: #endif +// REWRITE-NOT: #pragma clang module import fwd +// REWRITE: #endif +// +// NO-REWRITE-NOT: struct __FILE; // // REWRITE: #pragma clang module end // CHECK: # 2 "{{.*}}file2.h" 2 @@ -124,15 +136,17 @@ // NO-REWRITE: #pragma clang module end -__FILE *a; // expected-error {{declaration of '__FILE' must be imported}} +__FILE *a; // expected-error-re {{{{declaration of '__FILE' must be imported|unknown type name '__FILE'}}}} #if FILE_REWRITE -// expected-note@file.rewrite.ii:1 {{here}} +// expected-note@file.rewrite.ii:* {{here}} +#elif FILE_REWRITE_FULL +// No note diagnostic at all in this case: we've built the 'file' module but not loaded it into this compilation yet. #elif REWRITE -// expected-note@rewrite.ii:1 {{here}} +// expected-note@rewrite.ii:* {{here}} #elif COPY -// expected-note@copy.ii:1 {{here}} +// expected-note@copy.ii:* {{here}} #else -// expected-note@no-rewrite.ii:1 {{here}} +// expected-note@no-rewrite.ii:* {{here}} #endif #ifdef INCLUDE |