[PATCH] D43764: [clang-apply-replacements] Convert tooling::Replacements to tooling::AtomicChange for conflict resolving of changes, code cleanup, and code formatting.

[Malcolm Parsons via Phabricator via cfe-commits]

malcolm.parsons added a comment.

In https://reviews.llvm.org/D43764#1058120, @jdemeule wrote:

> Can I help in some way to close this PR?


I applied the patch and ran the tests.

There was one unexpected failure:

  [100%] Running the Clang extra tools' regression tests
  FAIL: Clang Tools :: clang-apply-replacements/conflict.cpp (10 of 896)
  ******************** TEST 'Clang Tools :: 
clang-apply-replacements/conflict.cpp' FAILED ********************
  Script:
  --
  mkdir -p 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict
  sed 
"s#\$(path)#/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict#"
 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/file1.yaml
 > 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/file1.yaml
  sed 
"s#\$(path)#/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict#"
 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
 > 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/file2.yaml
  sed 
"s#\$(path)#/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict#"
 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/file3.yaml
 > 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/file3.yaml
  sed 
"s#\$(path)#/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict#"
 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/expected.txt
 > 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/expected.txt
  not clang-apply-replacements 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict
 > 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/output.txt
 2>&1
  diff -b 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/output.txt
 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/expected.txt
  ls -1 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict
 | FileCheck 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/conflict.cpp
 --check-prefix=YAML
  not clang-apply-replacements 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict
 -remove-change-desc-files > 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict/output.txt
 2>&1
  ls -1 
/mparsons/llvm/llvm-build/tools/clang/tools/extra/test/clang-apply-replacements/Output/Inputs/conflict
 | FileCheck 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/conflict.cpp
 --check-prefix=NO_YAML
  --
  Exit Code: 1
  
  Command Output (stdout):
  --
  2,4d1
  < New replacement: 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/common.h:
 169:+0:"(int*)"
  < Existing replacement: 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/common.h:
 160:+12:""
  < The new replacement overlaps with an existing replacement.
  11a9,11
  > Existing replacement: 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/common.h:
 160:+12:""
  > The new replacement overlaps with an existing replacement.
  > New replacement: 
/mparsons/llvm/llvm/tools/clang/tools/extra/test/clang-apply-replacements/Inputs/conflict/common.h:
 169:+0:"(int*)"
  
  --
  
  ********************
  Testing Time: 21.09s
  ********************
  Failing Tests (1):
      Clang Tools :: clang-apply-replacements/conflict.cpp
  
    Expected Passes    : 893
    Unsupported Tests  : 2
    Unexpected Failures: 1


https://reviews.llvm.org/D43764



_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits