diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-06-05 18:39:31 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-06-05 18:39:31 +0000 |
| commit | 226dedc0e25135833753e80f96fcee8ba58fbad5 (patch) | |
| tree | 3575561a2b9446b3e56ddef35f7714e796dd1c74 /test/Modules | |
| parent | 1a6f43b655762d6b70594e47013ad8f14a12480d (diff) | |
Attempt to fix Windows buildbot failure due to mismatching directory separators in preprocessed output.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@304727 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules')
| -rw-r--r-- | test/Modules/preprocess-module.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/Modules/preprocess-module.cpp b/test/Modules/preprocess-module.cpp index 9d0af5a768..45f0821c9f 100644 --- a/test/Modules/preprocess-module.cpp +++ b/test/Modules/preprocess-module.cpp @@ -37,11 +37,18 @@ // 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: %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 // 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 // RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -I%S/Inputs/preprocess %t/file.pcm -E -frewrite-includes -o %t/file.rewrite.ii -// RUN: cmp %t/rewrite.ii %t/file.rewrite.ii +// FIXME: This check fails on Windows targets, due to canonicalization of directory separators. +// FIXME: cmp %t/rewrite.ii %t/file.rewrite.ii +// FIXME: Instead, just check that the preprocessed output is functionally equivalent to the output when preprocessing from the original sources. +// RUN: FileCheck %s --input-file %t/file.rewrite.ii --check-prefix=CHECK --check-prefix=REWRITE +// RUN: %clang_cc1 -fmodules -fmodule-name=file -fmodule-file=%t/fwd.pcm -x c++-module-map-cpp-output %t/file.rewrite.ii -emit-module -o %t/file.rewrite.pcm +// 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 // == module map // CHECK: # 1 "{{.*}}module.modulemap" @@ -110,7 +117,9 @@ __FILE *a; // expected-error {{declaration of '__FILE' must be imported}} -#ifdef REWRITE +#if FILE_REWRITE +// expected-note@file.rewrite.ii:1 {{here}} +#elif REWRITE // expected-note@rewrite.ii:1 {{here}} #elif COPY // expected-note@copy.ii:1 {{here}} |