From c8b180641c629e9a5542d5fecfe51e971a97155e Mon Sep 17 00:00:00 2001
From: Michael Schellenberger Costa <miscco@nvidia.com>
Date: Tue, 11 Jul 2023 08:10:05 +0200
Subject: [PATCH] Suppress some failing tests

---
 .../test/std/containers/sequences/array/front_back.pass.cpp     | 2 ++
 .../test/std/containers/sequences/array/indexing.pass.cpp       | 2 ++
 .../incrementable.traits/iter_difference_t.compile.pass.cpp     | 2 ++
 .../iterator.assoc.types/readable.traits/iter_value_t.pass.cpp  | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/libcudacxx/.upstream-tests/test/std/containers/sequences/array/front_back.pass.cpp b/libcudacxx/.upstream-tests/test/std/containers/sequences/array/front_back.pass.cpp
index f7767b5864e..05e9bf75d34 100644
--- a/libcudacxx/.upstream-tests/test/std/containers/sequences/array/front_back.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/containers/sequences/array/front_back.pass.cpp
@@ -38,6 +38,7 @@ __host__ __device__ constexpr bool check_back( double val )
 
 int main(int, char**)
 {
+#ifndef TEST_COMPILER_MSVC_2017
     {
         typedef double T;
         typedef cuda::std::array<T, 3> C;
@@ -123,6 +124,7 @@ int main(int, char**)
         static_assert (check_back (3.5), "");
     }
 #endif
+#endif // !TEST_COMPILER_MSVC_2017
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/containers/sequences/array/indexing.pass.cpp b/libcudacxx/.upstream-tests/test/std/containers/sequences/array/indexing.pass.cpp
index 8cc44eb3b19..1edb4bfa07e 100644
--- a/libcudacxx/.upstream-tests/test/std/containers/sequences/array/indexing.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/containers/sequences/array/indexing.pass.cpp
@@ -33,6 +33,7 @@ __host__ __device__ constexpr bool check_idx( size_t idx, double val )
 
 int main(int, char**)
 {
+#ifndef TEST_COMPILER_MSVC_2017
     {
         typedef double T;
         typedef cuda::std::array<T, 3> C;
@@ -115,6 +116,7 @@ int main(int, char**)
         static_assert (check_idx(2, 3.5), "");
     }
 #endif
+#endif // !TEST_COMPILER_MSVC_2017
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/incrementable.traits/iter_difference_t.compile.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/incrementable.traits/iter_difference_t.compile.pass.cpp
index 6a6a2afc199..f7ac6d2302b 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/incrementable.traits/iter_difference_t.compile.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/incrementable.traits/iter_difference_t.compile.pass.cpp
@@ -29,6 +29,7 @@ inline constexpr bool
   has_no_iter_difference_t<T, cuda::std::void_t<cuda::std::iter_difference_t<T>>> = false;
 #endif
 
+#ifndef TEST_COMPILER_MSVC_2017 // MSVC 2017 cannot make this a constexpr function
 template <class T, class Expected>
 __host__ __device__ constexpr bool check_iter_difference_t() {
   constexpr bool result = cuda::std::same_as<cuda::std::iter_difference_t<T>, Expected>;
@@ -52,6 +53,7 @@ struct int_subtraction {
   __host__ __device__ friend int operator-(int_subtraction, int_subtraction);
 };
 static_assert(check_iter_difference_t<int_subtraction, int>());
+#endif // !TEST_COMPILER_MSVC_2017
 
 static_assert(has_no_iter_difference_t<void>);
 static_assert(has_no_iter_difference_t<double>);
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/readable.traits/iter_value_t.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/readable.traits/iter_value_t.pass.cpp
index 2c32fd356a7..171d02690b4 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/readable.traits/iter_value_t.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.assoc.types/readable.traits/iter_value_t.pass.cpp
@@ -16,6 +16,7 @@
 
 #include <cuda/std/concepts>
 
+#ifndef TEST_COMPILER_MSVC_2017 // MSVC 2017 cannot make this a constexpr function
 template <class T, class Expected>
 __host__ __device__ constexpr bool check_iter_value_t() {
   constexpr bool result = cuda::std::same_as<cuda::std::iter_value_t<T>, Expected>;
@@ -41,6 +42,7 @@ struct both_members {
   using element_type = double;
 };
 static_assert(check_iter_value_t<both_members, double>());
+#endif // !TEST_COMPILER_MSVC_2017
 
 // clang-format off
 template <class T, class = void>