From 7b73f59d6dff3041c6d9cf02d20707c6463b4bb9 Mon Sep 17 00:00:00 2001 From: Gabor Marton Date: Tue, 24 Sep 2019 05:50:02 +0000 Subject: [PATCH] [ASTImporter] 3rd attempt to fix Windows buildbot test errors git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372688 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/AST/ASTImporterODRStrategiesTest.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/unittests/AST/ASTImporterODRStrategiesTest.cpp b/unittests/AST/ASTImporterODRStrategiesTest.cpp index 62368022a0..6272bcb9ea 100644 --- a/unittests/AST/ASTImporterODRStrategiesTest.cpp +++ b/unittests/AST/ASTImporterODRStrategiesTest.cpp @@ -30,9 +30,9 @@ using internal::BindableMatcher; struct Function { using DeclTy = FunctionDecl; - static constexpr auto *Prototype = "void X(char*, char);"; + static constexpr auto *Prototype = "void X(int);"; static constexpr auto *ConflictingPrototype = "void X(double);"; - static constexpr auto *Definition = "void X(char *a, char b) {}"; + static constexpr auto *Definition = "void X(int a) {}"; static constexpr auto *ConflictingDefinition = "void X(double a) {}"; BindableMatcher getPattern() { return functionDecl(hasName("X"), unless(isImplicit())); @@ -582,7 +582,8 @@ ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE( INSTANTIATE_TEST_CASE_P( ODRViolationTests, FunctionConservative, - DefaultTestValuesForRunOptions, ); +// These tests fail on Windows. + ::testing::Values(ArgVector{"-target", "x86_64-pc-linux-gnu"}), ); INSTANTIATE_TEST_CASE_P( ODRViolationTests, TypedefConservative, DefaultTestValuesForRunOptions, ); @@ -624,7 +625,8 @@ INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P( ODRViolationTests, FunctionLiberal, - DefaultTestValuesForRunOptions, ); +// These tests fail on Windows. + ::testing::Values(ArgVector{"-target", "x86_64-pc-linux-gnu"}), ); INSTANTIATE_TEST_CASE_P( ODRViolationTests, TypedefLiberal, DefaultTestValuesForRunOptions, ); -- 2.50.1