diff options
| author | Vlad Tsyrklevich <vlad@tsyrklevich.net> | 2017-08-18 23:21:11 +0000 |
|---|---|---|
| committer | Vlad Tsyrklevich <vlad@tsyrklevich.net> | 2017-08-18 23:21:11 +0000 |
| commit | eac4c13ac9ea8f12bc049e040c7b9c8a517f54e7 (patch) | |
| tree | 8a05f2a0726fd29aba0e7c5b9b9d112b5db00d49 /test | |
| parent | 0c78c5729f29315d7945988efd048c0cb86c07ce (diff) | |
Revert "[clang-diff] Move the JSON export function to clang-diff"
This reverts commit r311199, it was causing widespread build failures.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@311211 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/Tooling/clang-diff-json.cpp | 27 | ||||
| -rw-r--r-- | test/lit.cfg | 1 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 |
3 files changed, 0 insertions, 29 deletions
diff --git a/test/Tooling/clang-diff-json.cpp b/test/Tooling/clang-diff-json.cpp deleted file mode 100644 index ee67a6d1f3..0000000000 --- a/test/Tooling/clang-diff-json.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// RUN: clang-diff -ast-dump %s -- \ -// RUN: | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \ -// RUN: | FileCheck %s - -// CHECK: "begin": 294, -// CHECK: "type": "CXXRecordDecl", -// CHECK: "type": "FieldDecl", -// CHECK: "end": 314, -class A { - int x; -}; - -// CHECK: "children": [ -// CHECK-NEXT: { -// CHECK-NEXT: "begin": -// CHECK-NEXT: "children": [] -// CHECK-NEXT: "end": -// CHECK-NEXT: "id": -// CHECK-NEXT: "type": "CharacterLiteral" -// CHECK-NEXT: } -// CHECK: ] -// CHECK: "type": "VarDecl", -char nl = '\n'; - -// CHECK: "value": "abc \n\t\u0000\u001f\u0123 \ub370\ubc15" -char s[] = "abc \n\t\0\x1f\u0123 데박"; - diff --git a/test/lit.cfg b/test/lit.cfg index d87d803456..f2bcf99e5a 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -276,7 +276,6 @@ config.substitutions.append( ('%test_debuginfo', ' ' + config.llvm_src_root + '/ config.substitutions.append( ('%itanium_abi_triple', makeItaniumABITriple(config.target_triple)) ) config.substitutions.append( ('%ms_abi_triple', makeMSABITriple(config.target_triple)) ) config.substitutions.append( ('%resource_dir', getClangBuiltinIncludeDir(config.clang)) ) -config.substitutions.append( ('%python', config.python_executable) ) # The host triple might not be set, at least if we're compiling clang from # an already installed llvm. diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 10186fddf8..532ede8424 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -25,7 +25,6 @@ config.enable_shared = @ENABLE_SHARED@ config.enable_backtrace = @ENABLE_BACKTRACES@ config.host_arch = "@HOST_ARCH@" config.enable_abi_breaking_checks = "@LLVM_ENABLE_ABI_BREAKING_CHECKS@" -config.python_executable = "@PYTHON_EXECUTABLE@" # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time. |