Skip to content

Commit a4a9493

Browse files
committed
mutable_dispatch & negative command_buffer tests: fix Skip logic
If mutable_dispatch extension is supported, the mutable handle is allowed to be not null. In that case, skip the HandleNotNull negative tests.
1 parent fccf1e0 commit a4a9493

4 files changed

Lines changed: 41 additions & 0 deletions

File tree

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_barrier.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ struct CommandBufferBarrierMutableHandleNotNull : public BasicCommandBufferTest
9292
{
9393
using BasicCommandBufferTest::BasicCommandBufferTest;
9494

95+
bool Skip() override
96+
{
97+
if (BasicCommandBufferTest::Skip())
98+
return true;
99+
return is_extension_available(device,
100+
"cl_khr_command_buffer_mutable_dispatch");
101+
}
102+
95103
cl_int Run() override
96104
{
97105
cl_mutable_command_khr mutable_handle;

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_copy_image.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,14 @@ struct CommandBufferCopyImageMutableHandleNotNull : public CommandCopyBaseTest
357357
{
358358
using CommandCopyBaseTest::CommandCopyBaseTest;
359359

360+
bool Skip() override
361+
{
362+
if (CommandCopyBaseTest::Skip())
363+
return true;
364+
return is_extension_available(device,
365+
"cl_khr_command_buffer_mutable_dispatch");
366+
}
367+
360368
cl_int Run() override
361369
{
362370
cl_mutable_command_khr mutable_handle;

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_fill.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,14 @@ struct CommandBufferCommandFillBufferMutableHandleNotNull
416416
{
417417
using CommandFillBaseTest::CommandFillBaseTest;
418418

419+
bool Skip() override
420+
{
421+
if (CommandFillBaseTest::Skip())
422+
return true;
423+
return is_extension_available(device,
424+
"cl_khr_command_buffer_mutable_dispatch");
425+
}
426+
419427
cl_int Run() override
420428
{
421429
cl_mutable_command_khr mutable_handle;
@@ -440,6 +448,14 @@ struct CommandBufferCommandFillImageMutableHandleNotNull
440448
{
441449
using CommandFillBaseTest::CommandFillBaseTest;
442450

451+
bool Skip() override
452+
{
453+
if (CommandFillBaseTest::Skip())
454+
return true;
455+
return is_extension_available(device,
456+
"cl_khr_command_buffer_mutable_dispatch");
457+
}
458+
443459
cl_int Run() override
444460
{
445461
cl_mutable_command_khr mutable_handle;

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_svm_mem.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,15 @@ struct CommandBufferCommandSVMMutableHandleNotNull
207207
{
208208
using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest;
209209

210+
bool Skip() override
211+
{
212+
if (BasicSVMCommandBufferTest::Skip())
213+
return true;
214+
return is_extension_available(device,
215+
"cl_khr_command_buffer_mutable_dispatch");
216+
}
217+
218+
210219
cl_int Run() override
211220
{
212221
cl_mutable_command_khr mutable_handle;

0 commit comments

Comments
 (0)