From ee6d3fa07eed0d3187ded0cbc63fdbbdc4a8480c Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Wed, 16 Nov 2016 18:21:00 +0000 Subject: 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 --- clang/test/ASTMerge/codegen-body/Inputs/body1.c | 6 ++++++ clang/test/ASTMerge/codegen-body/Inputs/body2.c | 4 ++++ clang/test/ASTMerge/codegen-body/test.c | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 clang/test/ASTMerge/codegen-body/Inputs/body1.c create mode 100644 clang/test/ASTMerge/codegen-body/Inputs/body2.c create mode 100644 clang/test/ASTMerge/codegen-body/test.c (limited to 'clang/test/ASTMerge/codegen-body') diff --git a/clang/test/ASTMerge/codegen-body/Inputs/body1.c b/clang/test/ASTMerge/codegen-body/Inputs/body1.c new file mode 100644 index 00000000000..d4d1e4b9378 --- /dev/null +++ b/clang/test/ASTMerge/codegen-body/Inputs/body1.c @@ -0,0 +1,6 @@ +int f(); + +int main() +{ + return f(); +} diff --git a/clang/test/ASTMerge/codegen-body/Inputs/body2.c b/clang/test/ASTMerge/codegen-body/Inputs/body2.c new file mode 100644 index 00000000000..73cb1edf991 --- /dev/null +++ b/clang/test/ASTMerge/codegen-body/Inputs/body2.c @@ -0,0 +1,4 @@ +__inline__ __attribute__ ((always_inline)) int f() +{ + return 2; +} diff --git a/clang/test/ASTMerge/codegen-body/test.c b/clang/test/ASTMerge/codegen-body/test.c new file mode 100644 index 00000000000..7232bf4164b --- /dev/null +++ b/clang/test/ASTMerge/codegen-body/test.c @@ -0,0 +1,5 @@ +// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/body1.c +// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/body2.c +// RUN: %clang_cc1 -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast %s +// expected-no-diagnostics + -- cgit v1.2.3