4 Commits

Author	SHA1	Message	Date
Reid Kleckner	2423b7dfd3	Update ASTMerge FileCheck test expectations ... I belive many of these diagnostics changed from errors to warnings in r357394. I've simply mechanically updated the tests, but whoever owns this code should probably audit for unintented behavior changes. I wasn't able to find a flag to make these warnings errors again. llvm-svn: 360701	2019-05-14 19:02:39 +00:00
Reid Kleckner	0333dd9563	Restore test files accidentally deleted in r354839 ... I think there must be a bug in git-llvm causing parent directories to be deleted when the diff deletes files in a subdirectory. Perhaps it is Windows-only. There has been a behavior change, so some of these tests now fail. I have marked them XFAIL and will fix them in a follow-up to separate the changes. llvm-svn: 360699	2019-05-14 18:51:07 +00:00
Reid Kleckner	1144084cb2	Revert r354832 "[ASTImporter] Add support for importing ChooseExpr AST nodes." ... Test does not pass on Windows llvm-svn: 354839	2019-02-26 02:22:22 +00:00
Sean Callanan	ee6d3fa07e	Fixed layout of test/ASTMerge. ... As outlined in a previous RFC, the test/ASTMerge/Inputs folder is getting full and the tests are starting to become interdependent. This is undesirable because - it makes it harder to write new tests - it makes it harder to figure out at a glance what old tests are doing, and - it adds the risk of breaking one test while changing a different one, because of the interdependencies. To fix this, according to the conversation in the RFC, I have changed the layout from a.c Inputs/a1.c Inputs/a2.c to a/test.c a/Inputs/a1.c a/Inputs/a2.c for all existing tests. I have also eliminated interdependencies by replicating the input files for each test that uses them. https://reviews.llvm.org/D26571 llvm-svn: 287129	2016-11-16 18:21:00 +00:00