Author: martong Date: Tue Sep 24 02:00:46 2019 New Revision: 372705 URL: http://llvm.org/viewvc/llvm-project?rev=372705&view=rev Log: [ASTImporter] 4th attempt to fix Windows buildbot test errors
Modified: cfe/trunk/unittests/AST/ASTImporterODRStrategiesTest.cpp Modified: cfe/trunk/unittests/AST/ASTImporterODRStrategiesTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/AST/ASTImporterODRStrategiesTest.cpp?rev=372705&r1=372704&r2=372705&view=diff ============================================================================== --- cfe/trunk/unittests/AST/ASTImporterODRStrategiesTest.cpp (original) +++ cfe/trunk/unittests/AST/ASTImporterODRStrategiesTest.cpp Tue Sep 24 02:00:46 2019 @@ -580,10 +580,12 @@ ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_C // Instantiate the tests. // ====================== +// FIXME: These fail on Windows. +#if !defined(_WIN32) INSTANTIATE_TEST_CASE_P( ODRViolationTests, FunctionConservative, -// These tests fail on Windows. - ::testing::Values(ArgVector{"-target", "x86_64-pc-linux-gnu"}), ); + DefaultTestValuesForRunOptions, ); +#endif INSTANTIATE_TEST_CASE_P( ODRViolationTests, TypedefConservative, DefaultTestValuesForRunOptions, ); @@ -623,10 +625,12 @@ INSTANTIATE_TEST_CASE_P( //ODRViolationTests, VarTemplateSpecConservative, //DefaultTestValuesForRunOptions, ); +// FIXME: These fail on Windows. +#if !defined(_WIN32) INSTANTIATE_TEST_CASE_P( ODRViolationTests, FunctionLiberal, -// These tests fail on Windows. - ::testing::Values(ArgVector{"-target", "x86_64-pc-linux-gnu"}), ); + DefaultTestValuesForRunOptions, ); +#endif INSTANTIATE_TEST_CASE_P( ODRViolationTests, TypedefLiberal, DefaultTestValuesForRunOptions, ); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits