From 25733d353fec7999d12a16ec38169a9c43a7ac46 Mon Sep 17 00:00:00 2001 From: Michael Schellenberger Costa Date: Thu, 23 Nov 2023 08:43:12 +0000 Subject: [PATCH] Fix XFAIL condition for subsumption tests The EDG bug breaking our subsumption tests has been fixed. It will be released in a future nvcc version so we need to give the right nvcc version to unfail those tests Fixes nvbug4357708 --- .../indirectly_copyable.subsumption.compile.pass.cpp | 2 +- .../indirectly_movable.subsumption.compile.pass.cpp | 2 +- .../iterator.concept.bidir/subsumption.compile.pass.cpp | 2 +- .../iterator.concept.forward/subsumption.compile.pass.cpp | 2 +- .../iterator.concept.inc/subsumption.compile.pass.cpp | 2 +- .../iterator.concept.input/subsumption.compile.pass.cpp | 2 +- .../iterator.concept.iterator/subsumption.compile.pass.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp index 15522d34542..ca1c97299fe 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable.subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // template diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.move/indirectly_movable.subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.move/indirectly_movable.subsumption.compile.pass.cpp index b03d47bac10..bf0607beb39 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.move/indirectly_movable.subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/alg.req.ind.move/indirectly_movable.subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // template diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/subsumption.compile.pass.cpp index 2446000e46c..d59ca797d39 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // template diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp index fbee73669f0..883055cc65f 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // cuda::std::forward_iterator; diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.inc/subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.inc/subsumption.compile.pass.cpp index 10fa9f4fc7f..aead816c799 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.inc/subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.inc/subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // template diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/subsumption.compile.pass.cpp index 6562a118dcf..0d1d18ffc68 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // template diff --git a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/subsumption.compile.pass.cpp b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/subsumption.compile.pass.cpp index ddd41bcd71f..0e082c12274 100644 --- a/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/subsumption.compile.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/subsumption.compile.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11, c++14, c++17 -// XFAIL: c++20 && nvcc, c++20 && nvrtc +// XFAIL: c++20 && (nvrtc || nvcc-12.0 || nvcc-12.1 || nvcc-12.2 || nvcc-12.3) // nvbug 3885350 // template