[llvm-branch-commits] [cfe-branch] r339554 - Merging r339074:
Hans Wennborg via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Aug 13 04:51:40 PDT 2018
Author: hans
Date: Mon Aug 13 04:51:39 2018
New Revision: 339554
URL: http://llvm.org/viewvc/llvm-project?rev=339554&view=rev
Log:
Merging r339074:
------------------------------------------------------------------------
r339074 | stella.stamenova | 2018-08-07 00:37:45 +0200 (Tue, 07 Aug 2018) | 12 lines
[lit, python] Always add quotes around the python path in lit
Summary:
The issue with the python path is that the path to python on Windows can contain spaces. To make the tests always work, the path to python needs to be surrounded by quotes.
This is a companion change to: https://reviews.llvm.org/D50206
Reviewers: asmith, zturner
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D50281
------------------------------------------------------------------------
Modified:
cfe/branches/release_70/ (props changed)
cfe/branches/release_70/test/Tooling/clang-diff-json.cpp
Propchange: cfe/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 13 04:51:39 2018
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:338552-338553,338602,338627,338749,338942,339128,339170,339210,339281,339317,339428,339494
+/cfe/trunk:338552-338553,338602,338627,338749,338942,339074,339128,339170,339210,339281,339317,339428,339494
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_70/test/Tooling/clang-diff-json.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/Tooling/clang-diff-json.cpp?rev=339554&r1=339553&r2=339554&view=diff
==============================================================================
--- cfe/branches/release_70/test/Tooling/clang-diff-json.cpp (original)
+++ cfe/branches/release_70/test/Tooling/clang-diff-json.cpp Mon Aug 13 04:51:39 2018
@@ -1,10 +1,10 @@
// RUN: clang-diff -ast-dump-json %s -- \
-// RUN: | '%python' -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
+// 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": 301,
+// CHECK: "begin": 311,
// CHECK: "type": "FieldDecl",
-// CHECK: "end": 321,
+// CHECK: "end": 319,
// CHECK: "type": "CXXRecordDecl",
class A {
int x;
More information about the llvm-branch-commits
mailing list