Skip to content

Commit b68f566

Browse files
authored
Disable cuda tests
1 parent edf2de2 commit b68f566

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

lib/Interpreter/Paths.cpp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,22 @@ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts,
174174
if (!withSystem) continue;
175175
if (withFlags) incpaths.push_back("-isystem");
176176
break;
177-
// option doesn't appear to exist for llvm>19. Will revert if I determine
178-
// otherwise.
177+
// Option was removed in llvm 20. Git log message below.
178+
// git log --grep="index-header"
179+
// commit 19b4f17d4c0ae12725050d09f04f85bccc686d8e
180+
// Author: Jan Svoboda <[email protected]>
181+
// Date: Thu Oct 31 16:04:35 2024 -0700
182+
//
183+
// [clang][lex] Remove `-index-header-map` (#114459)
184+
//
185+
// This PR removes the `-index-header-map` functionality from Clang. AFAIK
186+
// this was only used internally at Apple and is now dead code. The main
187+
// motivation behind this change is to enable the removal of
188+
// `HeaderFileInfo::Framework` member and reducing the size of that data
189+
// structure.
190+
//
191+
// rdar://84036149
192+
179193
#if CLANG_VERSION_MAJOR < 20
180194
case frontend::IndexHeaderMap:
181195
if (!withSystem) continue;

unittests/CppInterOp/CUDATest.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ static bool HasCudaRuntime() {
4343

4444
#if CLANG_VERSION_MAJOR < 16
4545
TEST(DISABLED_CUDATest, Sanity) {
46+
#elif CLANG_VERSION_MAJOR == 20
47+
// FIXME: CUDA Tests Broken for llvm 20 release/
48+
TEST(DISABLED_CUDATest, Sanity) {
4649
#else
4750
TEST(CUDATest, Sanity) {
4851
#endif // CLANG_VERSION_MAJOR < 16
@@ -54,7 +57,12 @@ TEST(CUDATest, Sanity) {
5457
EXPECT_TRUE(Cpp::CreateInterpreter({}, {"--cuda"}));
5558
}
5659

60+
#if CLANG_VERSION_MAJOR == 20
61+
// FIXME: CUDA Tests Broken for llvm 20 release/
62+
TEST(DISABLED_CUDATest, CUDAH) {
63+
#else
5764
TEST(CUDATest, CUDAH) {
65+
#endif
5866
#ifdef _WIN32
5967
GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
6068
#endif
@@ -66,7 +74,12 @@ TEST(CUDATest, CUDAH) {
6674
EXPECT_TRUE(success);
6775
}
6876

77+
#if CLANG_VERSION_MAJOR == 20
78+
// FIXME: CUDA Tests Broken for llvm 20 release/
79+
TEST(DISABLED_CUDATest, CUDARuntime) {
80+
#else
6981
TEST(CUDATest, CUDARuntime) {
82+
#endif
7083
#ifdef _WIN32
7184
GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
7285
#endif

0 commit comments

Comments
 (0)