Index: cfe/trunk/test/Index/index-module-with-vfs.m =================================================================== --- cfe/trunk/test/Index/index-module-with-vfs.m +++ cfe/trunk/test/Index/index-module-with-vfs.m @@ -1,4 +1,6 @@ -// REQUIRES: shell +// FIXME: PR43272 +// XFAIL: windows + @import ModuleNeedsVFS; void foo() { @@ -7,11 +9,11 @@ } // 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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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 Index: cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m =================================================================== --- cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m +++ cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m @@ -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@INPUT_DIR@%/t@g" -e "s@OUT_DIR@%/t/example@g" \ // RUN: %S/../VFS/Inputs/vfsoverlay2.yaml > %t/srcvfs.yaml // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ Index: cfe/trunk/test/Modules/double-quotes.m =================================================================== --- cfe/trunk/test/Modules/double-quotes.m +++ cfe/trunk/test/Modules/double-quotes.m @@ -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@TEST_DIR@%/S/Inputs/double-quotes@g" \ // RUN: %S/Inputs/double-quotes/z.yaml > %t/z.yaml // The output with and without modules should be the same Index: cfe/trunk/test/Modules/framework-public-includes-private.m =================================================================== --- cfe/trunk/test/Modules/framework-public-includes-private.m +++ cfe/trunk/test/Modules/framework-public-includes-private.m @@ -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@TEST_DIR@%/S/Inputs/framework-public-includes-private@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. Index: cfe/trunk/test/VFS/external-names.c =================================================================== --- cfe/trunk/test/VFS/external-names.c +++ cfe/trunk/test/VFS/external-names.c @@ -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@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 + +// FIXME: PR43272 +// XFAIL: windows #include "external-names.h" #ifdef REINCLUDE Index: cfe/trunk/test/VFS/framework-import.m =================================================================== --- cfe/trunk/test/VFS/framework-import.m +++ cfe/trunk/test/VFS/framework-import.m @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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 Index: cfe/trunk/test/VFS/implicit-include.c =================================================================== --- cfe/trunk/test/VFS/implicit-include.c +++ cfe/trunk/test/VFS/implicit-include.c @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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(); Index: cfe/trunk/test/VFS/include-mixed-real-and-virtual.c =================================================================== --- cfe/trunk/test/VFS/include-mixed-real-and-virtual.c +++ cfe/trunk/test/VFS/include-mixed-real-and-virtual.c @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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" Index: cfe/trunk/test/VFS/include-real-from-virtual.c =================================================================== --- cfe/trunk/test/VFS/include-real-from-virtual.c +++ cfe/trunk/test/VFS/include-real-from-virtual.c @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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" Index: cfe/trunk/test/VFS/include-virtual-from-real.c =================================================================== --- cfe/trunk/test/VFS/include-virtual-from-real.c +++ cfe/trunk/test/VFS/include-virtual-from-real.c @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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" Index: cfe/trunk/test/VFS/include.c =================================================================== --- cfe/trunk/test/VFS/include.c +++ cfe/trunk/test/VFS/include.c @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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" Index: cfe/trunk/test/VFS/incomplete-umbrella.m =================================================================== --- cfe/trunk/test/VFS/incomplete-umbrella.m +++ cfe/trunk/test/VFS/incomplete-umbrella.m @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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 Index: cfe/trunk/test/VFS/module-import.m =================================================================== --- cfe/trunk/test/VFS/module-import.m +++ cfe/trunk/test/VFS/module-import.m @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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 @@ #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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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 Index: cfe/trunk/test/VFS/module_missing_vfs.m =================================================================== --- cfe/trunk/test/VFS/module_missing_vfs.m +++ cfe/trunk/test/VFS/module_missing_vfs.m @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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 Index: cfe/trunk/test/VFS/real-path-found-first.m =================================================================== --- cfe/trunk/test/VFS/real-path-found-first.m +++ cfe/trunk/test/VFS/real-path-found-first.m @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@g" %S/Inputs/vfsoverlay.yaml > %t.yaml // Build // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t-cache -F %t \ Index: cfe/trunk/test/VFS/relative-path.c =================================================================== --- cfe/trunk/test/VFS/relative-path.c +++ cfe/trunk/test/VFS/relative-path.c @@ -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@INPUT_DIR@%/S/Inputs@g" -e "s@OUT_DIR@%/t@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" Index: cfe/trunk/test/VFS/subframework-symlink.m =================================================================== --- cfe/trunk/test/VFS/subframework-symlink.m +++ cfe/trunk/test/VFS/subframework-symlink.m @@ -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@INPUT_DIR@/InvalidPath@g" -e "s@OUT_DIR@/InvalidPath@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 Index: cfe/trunk/test/VFS/test_nonmodular.c =================================================================== --- cfe/trunk/test/VFS/test_nonmodular.c +++ cfe/trunk/test/VFS/test_nonmodular.c @@ -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@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: %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 Index: cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m =================================================================== --- cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m +++ cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m @@ -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@VDIR@%/t/vdir@g" -e "s@OUT_DIR@%/t/outdir@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 Index: cfe/trunk/test/VFS/vfsroot-include.c =================================================================== --- cfe/trunk/test/VFS/vfsroot-include.c +++ cfe/trunk/test/VFS/vfsroot-include.c @@ -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@TEST_DIR@%/S@g" -e "s@OUT_DIR@%/t@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. Index: cfe/trunk/test/VFS/vfsroot-module.m =================================================================== --- cfe/trunk/test/VFS/vfsroot-module.m +++ cfe/trunk/test/VFS/vfsroot-module.m @@ -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@TEST_DIR@%/S@g" -e "s@OUT_DIR@%/t@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 Index: cfe/trunk/test/VFS/vfsroot-with-overlay.c =================================================================== --- cfe/trunk/test/VFS/vfsroot-with-overlay.c +++ cfe/trunk/test/VFS/vfsroot-with-overlay.c @@ -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@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: %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"