diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2016-03-17 16:19:51 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2016-03-17 16:19:51 +0000 |
commit | f8bff1c31c257abb760f08ef30f70205bc4b41f5 (patch) | |
tree | 0b90db4c7a1ba3c709a797d4b90a5a35dd24ddf9 /clang/test/Modules/crash-vfs-path-traversal.m | |
parent | 0f37fbac51743051a5bc739778fc92da05efdc70 (diff) | |
download | bcm5719-llvm-f8bff1c31c257abb760f08ef30f70205bc4b41f5.tar.gz bcm5719-llvm-f8bff1c31c257abb760f08ef30f70205bc4b41f5.zip |
Use a simpler set of mock headers for the vfs+modules crash recovery tests.
The System/ mock is large and too complex for this test. It can cause
the tests to fail in mysterious ways as it depends on the resource dir
being present, which is not really supported for driver tests (using
%clang instead of %clang_cc1). Copy the tree and trim out all the
%unnecessary fat.
llvm-svn: 263718
Diffstat (limited to 'clang/test/Modules/crash-vfs-path-traversal.m')
-rw-r--r-- | clang/test/Modules/crash-vfs-path-traversal.m | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/test/Modules/crash-vfs-path-traversal.m b/clang/test/Modules/crash-vfs-path-traversal.m index b7610a591e4..b8da86007fc 100644 --- a/clang/test/Modules/crash-vfs-path-traversal.m +++ b/clang/test/Modules/crash-vfs-path-traversal.m @@ -9,7 +9,7 @@ // RUN: mkdir -p %t/i %t/m %t // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ -// RUN: %clang -fsyntax-only %s -I %S/Inputs/System -isysroot %/t/i/ \ +// RUN: %clang -fsyntax-only %s -I %S/Inputs/crash-recovery -isysroot %/t/i/ \ // RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s // RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m @@ -17,7 +17,7 @@ // RUN: FileCheck --check-prefix=CHECKYAML %s -input-file \ // RUN: %t/crash-vfs-*.cache/vfs/vfs.yaml // RUN: find %t/crash-vfs-*.cache/vfs | \ -// RUN: grep "Inputs/System/usr/include/stdio.h" | count 1 +// RUN: grep "Inputs/crash-recovery/usr/include/stdio.h" | count 1 #include "usr/././//////include/../include/./././../include/stdio.h" @@ -37,12 +37,12 @@ // CHECKSH: "-ivfsoverlay" "crash-vfs-{{[^ ]*}}.cache/vfs/vfs.yaml" // CHECKYAML: 'type': 'directory' -// CHECKYAML: 'name': "{{[^ ]*}}/Inputs/System/usr/include", +// CHECKYAML: 'name': "{{[^ ]*}}/Inputs/crash-recovery/usr/include", // CHECKYAML-NEXT: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', // CHECKYAML-NEXT: 'name': "module.map", -// CHECKYAML-NEXT: 'external-contents': "{{[^ ]*}}/Inputs/System/usr/include/module.map" +// CHECKYAML-NEXT: 'external-contents': "{{[^ ]*}}/Inputs/crash-recovery/usr/include/module.map" // CHECKYAML-NEXT: }, // Replace the paths in the YAML files with relative ".." traversals @@ -52,7 +52,7 @@ // RUN: sed -e "s@usr/include@usr/include/../include@g" \ // RUN: %t/crash-vfs-*.cache/vfs/vfs.yaml > %t/vfs.yaml // RUN: unset FORCE_CLANG_DIAGNOSTICS_CRASH -// RUN: %clang -E %s -I %S/Inputs/System -isysroot %/t/i/ \ +// RUN: %clang -E %s -I %S/Inputs/crash-recovery -isysroot %/t/i/ \ // RUN: -ivfsoverlay %t/vfs.yaml -fmodules \ // RUN: -fmodules-cache-path=%t/m/ 2>&1 \ // RUN: | FileCheck %s --check-prefix=CHECKOVERLAY |