r371663 - Start porting ivfsoverlay tests to Windows
Reid Kleckner via cfe-commits
cfe-commits at lists.llvm.org
Wed Sep 11 13:56:25 PDT 2019
Author: rnk
Date: Wed Sep 11 13:56:25 2019
New Revision: 371663
URL: http://llvm.org/viewvc/llvm-project?rev=371663&view=rev
Log:
Start porting ivfsoverlay tests to Windows
Part of PR43272, the changes are:
1. Use @ as the sed pattern delimiter instead of : so that the drive
letter in lit substitutions isn't an issue.
2. Use the %/t and %/S substitutions to get paths with forward slashes
to work around string quoting issues in the yaml file.
3. Replace REQUIRES:shell with XFAIL:windows. These tests should pass on
Windows, but do not for reasons that are not yet understood. We would
like to know if they pass unexpectedly.
I was able to remove the XFAILs from two tests, since they already pass
with my sed fix:
clang/test/VFS/module_missing_vfs.m
clang/test/VFS/test_nonmodular.c
Reviewers: amccarth
Differential Revision: https://reviews.llvm.org/D67454
Modified:
cfe/trunk/test/Index/index-module-with-vfs.m
cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m
cfe/trunk/test/Modules/double-quotes.m
cfe/trunk/test/Modules/framework-public-includes-private.m
cfe/trunk/test/VFS/external-names.c
cfe/trunk/test/VFS/framework-import.m
cfe/trunk/test/VFS/implicit-include.c
cfe/trunk/test/VFS/include-mixed-real-and-virtual.c
cfe/trunk/test/VFS/include-real-from-virtual.c
cfe/trunk/test/VFS/include-virtual-from-real.c
cfe/trunk/test/VFS/include.c
cfe/trunk/test/VFS/incomplete-umbrella.m
cfe/trunk/test/VFS/module-import.m
cfe/trunk/test/VFS/module_missing_vfs.m
cfe/trunk/test/VFS/real-path-found-first.m
cfe/trunk/test/VFS/relative-path.c
cfe/trunk/test/VFS/subframework-symlink.m
cfe/trunk/test/VFS/test_nonmodular.c
cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m
cfe/trunk/test/VFS/vfsroot-include.c
cfe/trunk/test/VFS/vfsroot-module.m
cfe/trunk/test/VFS/vfsroot-with-overlay.c
Modified: cfe/trunk/test/Index/index-module-with-vfs.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-module-with-vfs.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/Index/index-module-with-vfs.m (original)
+++ cfe/trunk/test/Index/index-module-with-vfs.m Wed Sep 11 13:56:25 2019
@@ -1,4 +1,6 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
+
@import ModuleNeedsVFS;
void foo() {
@@ -7,11 +9,11 @@ void foo() {
}
// RUN: rm -rf %t.cache
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: c-index-test -index-file %s -fmodules-cache-path=%t.cache -fmodules -F %t -I %t \
// RUN: -ivfsoverlay %t.yaml -Xclang -fdisable-module-hash | FileCheck %s
-// CHECK: [importedASTFile]: {{.*}}ModuleNeedsVFS.pcm | loc: 2:1 | name: "ModuleNeedsVFS" | isImplicit: 0
+// CHECK: [importedASTFile]: {{.*}}ModuleNeedsVFS.pcm | loc: 4:1 | name: "ModuleNeedsVFS" | isImplicit: 0
// CHECK: [indexEntityReference]: kind: function | name: module_needs_vfs
// CHECK: [indexEntityReference]: kind: function | name: base_module_needs_vfs
Modified: cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m Wed Sep 11 13:56:25 2019
@@ -1,9 +1,9 @@
-// REQUIRES: crash-recovery, shell, system-darwin
+// REQUIRES: crash-recovery, system-darwin
// RUN: rm -rf %t
// RUN: mkdir -p %t/m
// RUN: cp %S/../VFS/Inputs/actual_module2.map %t/actual_module2.map
-// RUN: sed -e "s:INPUT_DIR:%t:g" -e "s:OUT_DIR:%t/example:g" \
+// RUN: sed -e "s at INPUT_DIR@%/t at g" -e "s at OUT_DIR@%/t/example at g" \
// RUN: %S/../VFS/Inputs/vfsoverlay2.yaml > %t/srcvfs.yaml
// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
Modified: cfe/trunk/test/Modules/double-quotes.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/double-quotes.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/Modules/double-quotes.m (original)
+++ cfe/trunk/test/Modules/double-quotes.m Wed Sep 11 13:56:25 2019
@@ -1,4 +1,5 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
// RUN: rm -rf %t
// RUN: mkdir %t
@@ -6,7 +7,7 @@
// RUN: %hmaptool write %S/Inputs/double-quotes/a.hmap.json %t/a.hmap
// RUN: %hmaptool write %S/Inputs/double-quotes/x.hmap.json %t/x.hmap
-// RUN: sed -e "s:TEST_DIR:%S/Inputs/double-quotes:g" \
+// RUN: sed -e "s at TEST_DIR@%/S/Inputs/double-quotes at g" \
// RUN: %S/Inputs/double-quotes/z.yaml > %t/z.yaml
// The output with and without modules should be the same
Modified: cfe/trunk/test/Modules/framework-public-includes-private.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/framework-public-includes-private.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/Modules/framework-public-includes-private.m (original)
+++ cfe/trunk/test/Modules/framework-public-includes-private.m Wed Sep 11 13:56:25 2019
@@ -1,4 +1,5 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
// RUN: rm -rf %t
// RUN: mkdir %t
@@ -6,7 +7,7 @@
// RUN: %hmaptool write %S/Inputs/framework-public-includes-private/a.hmap.json %t/a.hmap
// RUN: %hmaptool write %S/Inputs/framework-public-includes-private/z.hmap.json %t/z.hmap
-// RUN: sed -e "s:TEST_DIR:%S/Inputs/framework-public-includes-private:g" \
+// RUN: sed -e "s at TEST_DIR@%/S/Inputs/framework-public-includes-private at g" \
// RUN: %S/Inputs/framework-public-includes-private/z.yaml > %t/z.yaml
// The output with and without modules should be the same, without modules first.
Modified: cfe/trunk/test/VFS/external-names.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/external-names.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/external-names.c (original)
+++ cfe/trunk/test/VFS/external-names.c Wed Sep 11 13:56:25 2019
@@ -1,6 +1,8 @@
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" -e "s:EXTERNAL_NAMES:true:" %S/Inputs/use-external-names.yaml > %t.external.yaml
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" -e "s:EXTERNAL_NAMES:false:" %S/Inputs/use-external-names.yaml > %t.yaml
-// REQUIRES: shell
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" -e "s at EXTERNAL_NAMES@true@" %S/Inputs/use-external-names.yaml > %t.external.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" -e "s at EXTERNAL_NAMES@false@" %S/Inputs/use-external-names.yaml > %t.yaml
+
+// FIXME: PR43272
+// XFAIL: windows
#include "external-names.h"
#ifdef REINCLUDE
Modified: cfe/trunk/test/VFS/framework-import.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/framework-import.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/framework-import.m (original)
+++ cfe/trunk/test/VFS/framework-import.m Wed Sep 11 13:56:25 2019
@@ -1,6 +1,8 @@
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -F %t -ivfsoverlay %t.yaml -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
#import <SomeFramework/public_header.h>
Modified: cfe/trunk/test/VFS/implicit-include.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/implicit-include.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/implicit-include.c (original)
+++ cfe/trunk/test/VFS/implicit-include.c Wed Sep 11 13:56:25 2019
@@ -1,6 +1,8 @@
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -ivfsoverlay %t.yaml -I %t -include "not_real.h" -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
void foo() {
bar();
Modified: cfe/trunk/test/VFS/include-mixed-real-and-virtual.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/include-mixed-real-and-virtual.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/include-mixed-real-and-virtual.c (original)
+++ cfe/trunk/test/VFS/include-mixed-real-and-virtual.c Wed Sep 11 13:56:25 2019
@@ -1,9 +1,11 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: echo "void baz(void);" > %t/real.h
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -ivfsoverlay %t.yaml -I %t -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
#include "not_real.h"
#include "real.h"
Modified: cfe/trunk/test/VFS/include-real-from-virtual.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/include-real-from-virtual.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/include-real-from-virtual.c (original)
+++ cfe/trunk/test/VFS/include-real-from-virtual.c Wed Sep 11 13:56:25 2019
@@ -1,9 +1,11 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: echo "void baz(void);" > %t/real.h
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -ivfsoverlay %t.yaml -I %t -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
#include "include_real.h"
Modified: cfe/trunk/test/VFS/include-virtual-from-real.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/include-virtual-from-real.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/include-virtual-from-real.c (original)
+++ cfe/trunk/test/VFS/include-virtual-from-real.c Wed Sep 11 13:56:25 2019
@@ -1,9 +1,11 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t
// RUN: echo '#include "not_real.h"' > %t/include_not_real.h
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -ivfsoverlay %t.yaml -I %t -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
#include "include_not_real.h"
Modified: cfe/trunk/test/VFS/include.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/include.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/include.c (original)
+++ cfe/trunk/test/VFS/include.c Wed Sep 11 13:56:25 2019
@@ -1,6 +1,8 @@
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -I %t -ivfsoverlay %t.yaml -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
#include "not_real.h"
Modified: cfe/trunk/test/VFS/incomplete-umbrella.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/incomplete-umbrella.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/incomplete-umbrella.m (original)
+++ cfe/trunk/test/VFS/incomplete-umbrella.m Wed Sep 11 13:56:25 2019
@@ -1,10 +1,12 @@
// RUN: rm -rf %t
// RUN: mkdir -p %t/Incomplete.framework/Headers
// RUN: echo '// IncompleteReal.h' > %t/Incomplete.framework/Headers/IncompleteReal.h
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: not %clang_cc1 -Werror -fmodules -fimplicit-module-maps -fmodules-cache-path=%t \
// RUN: -ivfsoverlay %t.yaml -F %t -fsyntax-only %s 2>&1 | FileCheck %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
@import Incomplete;
// CHECK: umbrella header for module 'Incomplete' {{.*}}IncompleteVFS.h
Modified: cfe/trunk/test/VFS/module-import.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/module-import.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/module-import.m (original)
+++ cfe/trunk/test/VFS/module-import.m Wed Sep 11 13:56:25 2019
@@ -1,7 +1,9 @@
// RUN: rm -rf %t
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -ivfsoverlay %t.yaml -I %t -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
@import not_real;
@@ -17,7 +19,7 @@ void foo() {
#endif
// Override the module map (vfsoverlay2 on top)
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay2.yaml > %t2.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay2.yaml > %t2.yaml
// RUN: %clang_cc1 -Werror -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -ivfsoverlay %t.yaml -ivfsoverlay %t2.yaml -I %t -fsyntax-only %s
// vfsoverlay2 not present
Modified: cfe/trunk/test/VFS/module_missing_vfs.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/module_missing_vfs.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/module_missing_vfs.m (original)
+++ cfe/trunk/test/VFS/module_missing_vfs.m Wed Sep 11 13:56:25 2019
@@ -1,4 +1,3 @@
-// REQUIRES: shell
// RUN: rm -rf %t && mkdir -p %t
// RUN: echo "void funcA(void);" >> %t/a.h
@@ -6,7 +5,7 @@
// ERROR: virtual filesystem overlay file '{{.*}}' not found
// RUN: find %t/mcp -name "A-*.pcm" | count 1
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/MissingVFS/vfsoverlay.yaml > %t/vfs.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/MissingVFS/vfsoverlay.yaml > %t/vfs.yaml
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/mcp -I %S/Inputs/MissingVFS %s -fsyntax-only -ivfsoverlay %t/vfs.yaml
// RUN: find %t/mcp -name "A-*.pcm" | count 1
Modified: cfe/trunk/test/VFS/real-path-found-first.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/real-path-found-first.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/real-path-found-first.m (original)
+++ cfe/trunk/test/VFS/real-path-found-first.m Wed Sep 11 13:56:25 2019
@@ -4,11 +4,13 @@
// intentionally rebuild modules, since the precompiled module file refers to
// the dependency files by real path.
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
+
// RUN: rm -rf %t %t-cache %t.pch
// RUN: mkdir -p %t/SomeFramework.framework/Modules
// RUN: cat %S/Inputs/some_frame_module.map > %t/SomeFramework.framework/Modules/module.modulemap
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// Build
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t-cache -F %t \
Modified: cfe/trunk/test/VFS/relative-path.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/relative-path.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/relative-path.c (original)
+++ cfe/trunk/test/VFS/relative-path.c Wed Sep 11 13:56:25 2019
@@ -1,8 +1,10 @@
// RUN: mkdir -p %t
// RUN: cd %t
-// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@%/S/Inputs at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsoverlay.yaml > %t.yaml
// RUN: %clang_cc1 -Werror -I . -ivfsoverlay %t.yaml -fsyntax-only %s
-// REQUIRES: shell
+
+// FIXME: PR43272
+// XFAIL: windows
#include "not_real.h"
Modified: cfe/trunk/test/VFS/subframework-symlink.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/subframework-symlink.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/subframework-symlink.m (original)
+++ cfe/trunk/test/VFS/subframework-symlink.m Wed Sep 11 13:56:25 2019
@@ -1,4 +1,5 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
// Test that when a subframework is a symlink to another framework, we don't
// add it as a submodule to the enclosing framework. We also need to make clang
@@ -17,7 +18,7 @@
// Adding VFS overlay shouldn't change this behavior.
//
-// RUN: sed -e "s:INPUT_DIR:/InvalidPath:g" -e "s:OUT_DIR:/InvalidPath:g" %S/Inputs/vfsoverlay.yaml > %t/overlay.yaml
+// RUN: sed -e "s at INPUT_DIR@/InvalidPath at g" -e "s at OUT_DIR@/InvalidPath at g" %S/Inputs/vfsoverlay.yaml > %t/overlay.yaml
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache2 -F %t -fsyntax-only %s -ivfsoverlay %t/overlay.yaml
#import <WithSubframework/WithSubframework.h>
Modified: cfe/trunk/test/VFS/test_nonmodular.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/test_nonmodular.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/test_nonmodular.c (original)
+++ cfe/trunk/test/VFS/test_nonmodular.c Wed Sep 11 13:56:25 2019
@@ -1,11 +1,9 @@
-// REQUIRES: shell
-
// RUN: rm -rf %t
// RUN: mkdir -p %t/vdir %t/cache %t/outdir
// We can't have module.map inside Inputs/Nonmodular.
// RUN: cp %S/Inputs/Nonmodular/Nonmodular.modulemap %t/outdir/module.modulemap
//
-// RUN: sed -e "s:VDIR:%t/vdir:g" -e "s:IN_DIR:%S:g" -e "s:OUT_DIR:%t/outdir:g" %S/Inputs/Nonmodular/nonmodular-headers.yaml > %t/vdir/nonmodular-headers.yaml
+// RUN: sed -e "s at VDIR@%/t/vdir at g" -e "s at IN_DIR@%/S at g" -e "s at OUT_DIR@%/t/outdir at g" %S/Inputs/Nonmodular/nonmodular-headers.yaml > %t/vdir/nonmodular-headers.yaml
// RUN: %clang_cc1 -fmodule-name=Nonmodular -fmodules -Wnon-modular-include-in-framework-module -verify -fimplicit-module-maps -fmodules-cache-path=%t/cache -ivfsoverlay %t/vdir/nonmodular-headers.yaml -I %S/Inputs -F %t/vdir -fsyntax-only %S/Inputs/Nonmodular/test.c
// expected-no-diagnostics
Modified: cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m (original)
+++ cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m Wed Sep 11 13:56:25 2019
@@ -1,13 +1,13 @@
-// REQUIRES: crash-recovery, shell
+// REQUIRES: crash-recovery
-// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// FIXME: PR43272
+// XFAIL: windows
// RUN: rm -rf %t
// RUN: mkdir -p %t/vdir %t/outdir %t/cache
// RUN: cp -R %S/Inputs/Bar.framework %t/outdir/
//
-// RUN: sed -e "s:VDIR:%t/vdir:g" -e "s:OUT_DIR:%t/outdir:g" %S/Inputs/bar-headers.yaml > %t/vdir/bar-headers.yaml
+// RUN: sed -e "s at VDIR@%/t/vdir at g" -e "s at OUT_DIR@%/t/outdir at g" %S/Inputs/bar-headers.yaml > %t/vdir/bar-headers.yaml
// RUN: rm -f %t/outdir/Bar.framework/Headers/B.h
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -ivfsoverlay %t/vdir/bar-headers.yaml -F %t/vdir -fsyntax-only %s
Modified: cfe/trunk/test/VFS/vfsroot-include.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/vfsroot-include.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/vfsroot-include.c (original)
+++ cfe/trunk/test/VFS/vfsroot-include.c Wed Sep 11 13:56:25 2019
@@ -1,7 +1,9 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
+
// RUN: rm -rf %t
// RUN: mkdir -p %t
-// RUN: sed -e "s:TEST_DIR:%S:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsroot.yaml > %t.yaml
+// RUN: sed -e "s at TEST_DIR@%/S at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsroot.yaml > %t.yaml
// RUN: not %clang_cc1 -Werror -ivfsoverlay %t.yaml -I %S/Inputs -I /direct-vfs-root-files -fsyntax-only /tests/vfsroot-include.c 2>&1 | FileCheck %s
// The line above tests that the compiler input file is looked up through VFS.
Modified: cfe/trunk/test/VFS/vfsroot-module.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/vfsroot-module.m?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/vfsroot-module.m (original)
+++ cfe/trunk/test/VFS/vfsroot-module.m Wed Sep 11 13:56:25 2019
@@ -1,7 +1,9 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
+
// RUN: rm -rf %t
// RUN: mkdir -p %t
-// RUN: sed -e "s:TEST_DIR:%S:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsroot.yaml > %t.yaml
+// RUN: sed -e "s at TEST_DIR@%/S at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsroot.yaml > %t.yaml
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fdisable-module-hash -fmodules-cache-path=%t/cache -ivfsoverlay %t.yaml -F %S/Inputs -fsyntax-only /tests/vfsroot-module.m
// Test that a file missing from the VFS root is not found, even if it is
Modified: cfe/trunk/test/VFS/vfsroot-with-overlay.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/vfsroot-with-overlay.c?rev=371663&r1=371662&r2=371663&view=diff
==============================================================================
--- cfe/trunk/test/VFS/vfsroot-with-overlay.c (original)
+++ cfe/trunk/test/VFS/vfsroot-with-overlay.c Wed Sep 11 13:56:25 2019
@@ -1,8 +1,10 @@
-// REQUIRES: shell
+// FIXME: PR43272
+// XFAIL: windows
+
// RUN: rm -rf %t
// RUN: mkdir -p %t
-// RUN: sed -e "s:TEST_DIR:%S:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsroot.yaml > %t.yaml
-// RUN: sed -e "s:INPUT_DIR:/indirect-vfs-root-files:g" -e "s:OUT_DIR:/overlay-dir:g" %S/Inputs/vfsoverlay.yaml > %t/vfsoverlay.yaml
+// RUN: sed -e "s at TEST_DIR@%/S at g" -e "s at OUT_DIR@%/t at g" %S/Inputs/vfsroot.yaml > %t.yaml
+// RUN: sed -e "s at INPUT_DIR@/indirect-vfs-root-files at g" -e "s at OUT_DIR@/overlay-dir at g" %S/Inputs/vfsoverlay.yaml > %t/vfsoverlay.yaml
// RUN: %clang_cc1 -Werror -ivfsoverlay %t.yaml -ivfsoverlay /direct-vfs-root-files/vfsoverlay.yaml -I /overlay-dir -fsyntax-only /tests/vfsroot-with-overlay.c
#include "not_real.h"
More information about the cfe-commits
mailing list