Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make UNRECOVERABLE_IF fail in tests.

Browse Source 
- Fix tests that were triggering the UNRECOVERABLE scenario
- Change UNRECOVERABLE to DEBUG_BREAK in some places

Change-Id: I479baac4941b485af9ea81a61a1a03d2f3f42e6a
This commit is contained in:
Mrozek, Michal
2017-12-20 14:28:42 +01:00
committed by sys_ocldev
parent b503597ffa
commit 03646887bf
8 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unit_tests/command_queue/command_queue_tests.cpp
View File

@ -686,7 +686,8 @@ HWTEST_F(KmdNotifyTests, givenNotReadyTaskCountWhenWaitUntilCompletionCalledThen
EXPECT_CALL(*csr, waitForFlushStamp(flushStampToWait)).Times(1).WillOnce(::testing::Return(true));
EXPECT_CALL(*csr, waitForCompletionWithTimeout(false, 1, taskCountToWait)).Times(1).WillOnce(::testing::Return(false));
cmdQ->waitUntilComplete(taskCountToWait, flushStampToWait);
//we have unrecoverable for this case, this will throw.
EXPECT_THROW(cmdQ->waitUntilComplete(taskCountToWait, flushStampToWait), std::exception);
}
HWTEST_F(KmdNotifyTests, givenReadyTaskCountWhenWaitUntilCompletionCalledThenTryCpuPollingAndDontCallKmdWait) {

6
unit_tests/event/event_builder_tests.cpp
View File

@ -222,10 +222,13 @@ TEST(EventBuilder, whenAddingNullptrAsNewParentEventThenItIsIgnored) {
TEST(EventBuilder, whenAddingValidEventAsNewParentEventThenItIsProperlyAddedToParentsList) {
auto event = new SmallEventBuilderEventMock;
SmallEventBuilderMock eventBuilder;
eventBuilder.create<MockEvent<Event>>(nullptr, CL_COMMAND_MARKER, 0, 0);
EXPECT_EQ(0U, eventBuilder.getParentEvents().size());
eventBuilder.addParentEvent(event);
EXPECT_EQ(1U, eventBuilder.getParentEvents().size());
event->release();
eventBuilder.finalize();
eventBuilder.getEvent()->release();
}
TEST(EventBuilder, whenAddingMultipleEventsAsNewParentsThenOnlyValidOnesAreInsertedIntoParentsList) {
@ -234,12 +237,15 @@ TEST(EventBuilder, whenAddingMultipleEventsAsNewParentsThenOnlyValidOnesAreInser
invalidEvent->overrideMagic(0);
cl_event eventsList[] = {nullptr, event, invalidEvent};
SmallEventBuilderMock eventBuilder;
eventBuilder.create<MockEvent<Event>>(nullptr, CL_COMMAND_MARKER, 0, 0);
EXPECT_EQ(0U, eventBuilder.getParentEvents().size());
eventBuilder.addParentEvents(ArrayRef<cl_event>(eventsList));
ASSERT_EQ(1U, eventBuilder.getParentEvents().size());
EXPECT_EQ(event, *eventBuilder.getParentEvents().begin());
invalidEvent->release();
event->release();
eventBuilder.finalize();
eventBuilder.getEvent()->release();
}
TEST(EventBuilder, parentListDoesNotHaveDuplicates) {

2
unit_tests/helpers/debug_helpers.cpp
View File

@ -20,11 +20,13 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include <exception>
#include "runtime/helpers/debug_helpers.h"
namespace OCLRT {
void debugBreak(int line, const char *file) {
}
void abortUnrecoverable(int line, const char *file) {
throw std::exception();
}
} // namespace OCLRT

3
unit_tests/os_interface/linux/drm_buffer_object_tests.cpp
View File

@ -111,8 +111,7 @@ TEST_F(DrmBufferObjectTest, exec_ioctlFailed) {
testing::internal::CaptureStderr();
mock->ioctl_expected = 1;
mock->ioctl_res = -1;
auto ret = bo->exec(0, 0, 0);
EXPECT_EQ(mock->ioctl_res, ret);
EXPECT_THROW(bo->exec(0, 0, 0), std::exception);
testing::internal::GetCapturedStderr();
}

3
unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
View File

@ -492,8 +492,7 @@ TEST_F(DrmMemoryManagerTest, BoWaitFailure) {
BufferObject *bo = memoryManager->allocUserptr(0, (size_t)1024, 0ul, true);
ASSERT_NE(nullptr, bo);
mock->ioctl_res = -EIO;
auto ret = bo->wait(-1);
EXPECT_EQ(-EIO, ret);
EXPECT_THROW(bo->wait(-1), std::exception);
mock->ioctl_res = 1;
memoryManager->unreference(bo);