[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

diff --git a/unittests/AST/ASTImporterODRStrategiesTest.cpp b/unittests/AST/ASTImporterODRStrategiesTest.cpp
index 62368022a0c73943a43f508011b6618ef6936a89..6272bcb9ea40ca9a969e46035c46324bf556546f 100644 (file)
--- 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<Decl> 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, );