Author: chapuni
Date: Tue Nov 4 07:32:17 2014
New Revision: 221266
URL: http://llvm.org/viewvc/llvm-project?rev=221266&view=rev
Log:
clang/test/Tooling: [PR15590] Avoid backslashes in JSON. Should work on win32.
Modified:
cfe/trunk/test/Tooling/auto-detect-from-source-parent.cpp
cfe/trunk/test/Tooling/auto-detect-from-source.cpp
cfe/trunk/test/Tooling/clang-check-autodetect-dir.cpp
Modified: cfe/trunk/test/Tooling/auto-detect-from-source-parent.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Tooling/auto-detect-from-source-parent.cpp?rev=221266&r1=221265&r2=221266&view=diff
==============================================================================
--- cfe/trunk/test/Tooling/auto-detect-from-source-parent.cpp (original)
+++ cfe/trunk/test/Tooling/auto-detect-from-source-parent.cpp Tue Nov 4
07:32:17 2014
@@ -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
Modified: cfe/trunk/test/Tooling/auto-detect-from-source.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Tooling/auto-detect-from-source.cpp?rev=221266&r1=221265&r2=221266&view=diff
==============================================================================
--- cfe/trunk/test/Tooling/auto-detect-from-source.cpp (original)
+++ cfe/trunk/test/Tooling/auto-detect-from-source.cpp Tue Nov 4 07:32:17 2014
@@ -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
Modified: cfe/trunk/test/Tooling/clang-check-autodetect-dir.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Tooling/clang-check-autodetect-dir.cpp?rev=221266&r1=221265&r2=221266&view=diff
==============================================================================
--- cfe/trunk/test/Tooling/clang-check-autodetect-dir.cpp (original)
+++ cfe/trunk/test/Tooling/clang-check-autodetect-dir.cpp Tue Nov 4 07:32:17
2014
@@ -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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
