diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-11-04 13:32:17 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-11-04 13:32:17 +0000 |
| commit | 83910ae5b68562f9693d5c179bac407e9a8312dd (patch) | |
| tree | 13ac971e3ec2af28c5bcf565c8c1298165de814c | |
| parent | f4de174a4439eaa7e13925b270ba0ba3caf5af51 (diff) | |
| download | bcm5719-llvm-83910ae5b68562f9693d5c179bac407e9a8312dd.tar.gz bcm5719-llvm-83910ae5b68562f9693d5c179bac407e9a8312dd.zip | |
clang/test/Tooling: [PR15590] Avoid backslashes in JSON. Should work on win32.
llvm-svn: 221266
| -rw-r--r-- | clang/test/Tooling/auto-detect-from-source-parent.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Tooling/auto-detect-from-source.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Tooling/clang-check-autodetect-dir.cpp | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/clang/test/Tooling/auto-detect-from-source-parent.cpp b/clang/test/Tooling/auto-detect-from-source-parent.cpp index 5f27d5ab805..830d09d6a0e 100644 --- a/clang/test/Tooling/auto-detect-from-source-parent.cpp +++ b/clang/test/Tooling/auto-detect-from-source-parent.cpp @@ -1,12 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir -p %t/abc/def/ijk/qwe -// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %t/abc/def/ijk/qwe/test.cpp\",\"file\":\"%t/abc/def/ijk/qwe/test.cpp\"}]" | sed -e 's/\\/\\\\/g' > %t/compile_commands.json +// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %/t/abc/def/ijk/qwe/test.cpp\",\"file\":\"%/t/abc/def/ijk/qwe/test.cpp\"}]" | sed -e 's/\\/\\\\/g' > %t/compile_commands.json // RUN: cp "%s" "%t/abc/def/ijk/qwe/test.cpp" // RUN: not clang-check "%t/abc/def/ijk/qwe/test.cpp" 2>&1 | FileCheck %s // CHECK: C++ requires invalid; - -// REQUIRES: shell -// PR15590 -// XFAIL: win64 diff --git a/clang/test/Tooling/auto-detect-from-source.cpp b/clang/test/Tooling/auto-detect-from-source.cpp index 6ff39acdc8c..12a660d585a 100644 --- a/clang/test/Tooling/auto-detect-from-source.cpp +++ b/clang/test/Tooling/auto-detect-from-source.cpp @@ -1,12 +1,8 @@ // RUN: rm -rf %t // RUN: mkdir %t -// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %t/test.cpp\",\"file\":\"%t/test.cpp\"}]" | sed -e 's/\\/\\\\/g' > %t/compile_commands.json +// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %/t/test.cpp\",\"file\":\"%/t/test.cpp\"}]" | sed -e 's/\\/\\\\/g' > %t/compile_commands.json // RUN: cp "%s" "%t/test.cpp" // RUN: not clang-check "%t/test.cpp" 2>&1 | FileCheck %s // CHECK: C++ requires invalid; - -// REQUIRES: shell -// PR15590 -// XFAIL: win64 diff --git a/clang/test/Tooling/clang-check-autodetect-dir.cpp b/clang/test/Tooling/clang-check-autodetect-dir.cpp index 8ef3f3d0173..b84f3fede88 100644 --- a/clang/test/Tooling/clang-check-autodetect-dir.cpp +++ b/clang/test/Tooling/clang-check-autodetect-dir.cpp @@ -1,13 +1,9 @@ // RUN: rm -rf %t // RUN: mkdir -p %t/abc/def -// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %t/test.cpp\",\"file\":\"%t/test.cpp\"}]" | sed -e 's/\\/\\\\/g' > %t/compile_commands.json +// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %/t/test.cpp\",\"file\":\"%/t/test.cpp\"}]" | sed -e 's/\\/\\\\/g' > %t/compile_commands.json // RUN: cp "%s" "%t/test.cpp" // RUN: not clang-check -p "%t/abc/def" "%t/test.cpp" 2>&1|FileCheck %s // FIXME: Make the above easier. // CHECK: C++ requires invalid; - -// REQUIRES: shell -// PR15590 -// XFAIL: win64 |
