Skip to content

Commit 8294d9e

Browse files
authored
[UR] Ensure all CTS SetUp functions check their results (#18631)
Failing gtest doesn't fail right away. Wrap all calls to base class "SetUp" methods in the `UUR_RETURN_ON_FATAL_FAILURE` macro. This also includes cases where these functions were the last line in the function, making it a NFC, but updating those for consistency.
1 parent 80a1ff0 commit 8294d9e

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunchAndMemcpyInOrder.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ struct urEnqueueKernelLaunchIncrementMultiDeviceMultiThreadTest
347347
queuePerThread = std::get<1>(getParam()).value;
348348
// With !queuePerThread this becomes a test on a single device
349349
this->trueMultiDevice = queuePerThread;
350-
urEnqueueKernelLaunchIncrementMultiDeviceTestWithParam<Param>::SetUp();
350+
UUR_RETURN_ON_FATAL_FAILURE(
351+
urEnqueueKernelLaunchIncrementMultiDeviceTestWithParam<Param>::SetUp());
351352
}
352353

353354
bool useEvents;

unified-runtime/test/conformance/enqueue/urEnqueueUSMAdvise.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ TEST_P(urEnqueueUSMAdviseWithParamTest, Success) {
4646
struct urEnqueueUSMAdviseTest : uur::urUSMDeviceAllocTest {
4747
void SetUp() override {
4848
UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
49-
uur::urUSMDeviceAllocTest::SetUp();
49+
UUR_RETURN_ON_FATAL_FAILURE(uur::urUSMDeviceAllocTest::SetUp());
5050
}
5151
};
5252
UUR_INSTANTIATE_DEVICE_TEST_SUITE(urEnqueueUSMAdviseTest);

unified-runtime/test/conformance/enqueue/urEnqueueUSMMemcpy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE(urEnqueueUSMMemcpyTest);
178178

179179
struct urEnqueueUSMMemcpyMultiDeviceTest : uur::urAllDevicesTest {
180180
void SetUp() override {
181-
uur::urAllDevicesTest::SetUp();
181+
UUR_RETURN_ON_FATAL_FAILURE(uur::urAllDevicesTest::SetUp());
182182
for (auto &device : devices) {
183183
ur_device_usm_access_capability_flags_t device_usm = 0;
184184
ASSERT_SUCCESS(uur::GetDeviceUSMDeviceSupport(device, device_usm));

unified-runtime/test/conformance/enqueue/urEnqueueUSMPrefetch.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ struct urEnqueueUSMPrefetchWithParamTest
1313
// The setup for the parent fixture does a urQueueFlush, which isn't
1414
// supported by native cpu.
1515
UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
16-
uur::urUSMDeviceAllocTestWithParam<ur_usm_migration_flag_t>::SetUp();
16+
UUR_RETURN_ON_FATAL_FAILURE(
17+
uur::urUSMDeviceAllocTestWithParam<ur_usm_migration_flag_t>::SetUp());
1718
}
1819
};
1920

unified-runtime/test/conformance/memory-migrate/urMemBufferMigrateAcrossDevices.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using T = uint32_t;
1313

1414
struct urMultiDeviceContextTest : uur::urPlatformTest {
1515
void SetUp() {
16-
uur::urPlatformTest::SetUp();
16+
UUR_RETURN_ON_FATAL_FAILURE(uur::urPlatformTest::SetUp());
1717
ASSERT_SUCCESS(
1818
urDeviceGet(platform, UR_DEVICE_TYPE_ALL, 0, nullptr, &num_devices));
1919
if (num_devices <= 1) {
@@ -52,7 +52,7 @@ struct urMultiDeviceContextTest : uur::urPlatformTest {
5252

5353
struct urMultiDeviceContextMemBufferTest : urMultiDeviceContextTest {
5454
void SetUp() {
55-
urMultiDeviceContextTest::SetUp();
55+
UUR_RETURN_ON_FATAL_FAILURE(urMultiDeviceContextTest::SetUp());
5656
if (num_devices <= 1) {
5757
return;
5858
}

unified-runtime/test/conformance/memory/urMemGetInfo.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ TEST_P(urMemGetInfoTest, InvalidNullPointerPropSizeRet) {
113113
}
114114

115115
struct urMemGetInfoImageTest : uur::urMemImageTest {
116-
void SetUp() override { uur::urMemImageTest::SetUp(); }
116+
void SetUp() override {
117+
UUR_RETURN_ON_FATAL_FAILURE(uur::urMemImageTest::SetUp());
118+
}
117119
};
118120
UUR_INSTANTIATE_DEVICE_TEST_SUITE(urMemGetInfoImageTest);
119121

unified-runtime/test/conformance/queue/urQueueGetInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ TEST_P(urQueueGetInfoTest, InvalidNullPointerPropSizeRet) {
222222
struct urQueueGetInfoDeviceQueueTestWithInfoParam : public uur::urQueueTest {
223223
void SetUp() {
224224
UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
225-
urQueueGetInfoTest::SetUp();
225+
UUR_RETURN_ON_FATAL_FAILURE(urQueueGetInfoTest::SetUp());
226226
ur_queue_flags_t deviceQueueCapabilities = 0;
227227
ASSERT_SUCCESS(urDeviceGetInfo(
228228
device, UR_DEVICE_INFO_QUEUE_ON_DEVICE_PROPERTIES,

0 commit comments

Comments
 (0)