diff options
Diffstat (limited to 'test/DriverTestHelpers.cpp')
-rw-r--r-- | test/DriverTestHelpers.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp index 44e6e725..1f9fc1ee 100644 --- a/test/DriverTestHelpers.cpp +++ b/test/DriverTestHelpers.cpp @@ -1,12 +1,11 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // + #include "DriverTestHelpers.hpp" #include <log/log.h> -#include <doctest/doctest.h> - namespace android { namespace hardware @@ -140,10 +139,10 @@ android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_0::Model& mode driver.prepareModel(model, cb); prepareStatus = cb->GetErrorStatus(); - CHECK((int)prepareStatus == (int)expectedStatus); + DOCTEST_CHECK((int)prepareStatus == (int)expectedStatus); if (expectedStatus == V1_0::ErrorStatus::NONE) { - CHECK((cb->GetPreparedModel() != nullptr)); + DOCTEST_CHECK((cb->GetPreparedModel() != nullptr)); } return cb->GetPreparedModel(); } @@ -159,10 +158,10 @@ android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_1::Model& mode driver.prepareModel_1_1(model, V1_1::ExecutionPreference::LOW_POWER, cb); prepareStatus = cb->GetErrorStatus(); - CHECK((int)prepareStatus == (int)expectedStatus); + DOCTEST_CHECK((int)prepareStatus == (int)expectedStatus); if (expectedStatus == V1_0::ErrorStatus::NONE) { - CHECK((cb->GetPreparedModel() != nullptr)); + DOCTEST_CHECK((cb->GetPreparedModel() != nullptr)); } return cb->GetPreparedModel(); } @@ -185,10 +184,10 @@ android::sp<V1_2::IPreparedModel> PrepareModelWithStatus_1_2(const armnn_driver: driver.prepareModel_1_2(model, V1_1::ExecutionPreference::LOW_POWER, emptyHandle1, emptyHandle2, emptyToken, cb); prepareStatus = cb->GetErrorStatus(); - CHECK((int)prepareStatus == (int)expectedStatus); + DOCTEST_CHECK((int)prepareStatus == (int)expectedStatus); if (expectedStatus == V1_0::ErrorStatus::NONE) { - CHECK((cb->GetPreparedModel_1_2() != nullptr)); + DOCTEST_CHECK((cb->GetPreparedModel_1_2() != nullptr)); } return cb->GetPreparedModel_1_2(); } @@ -220,7 +219,7 @@ android::sp<V1_3::IPreparedModel> PrepareModelWithStatus_1_3(const armnn_driver: prepareStatus = cb->Get_1_3_ErrorStatus(); if (prepareStatus == V1_3::ErrorStatus::NONE) { - CHECK((cb->GetPreparedModel_1_3() != nullptr)); + DOCTEST_CHECK((cb->GetPreparedModel_1_3() != nullptr)); } return cb->GetPreparedModel_1_3(); } @@ -231,10 +230,10 @@ V1_0::ErrorStatus Execute(android::sp<V1_0::IPreparedModel> preparedModel, const V1_0::Request& request, V1_0::ErrorStatus expectedStatus) { - CHECK(preparedModel.get() != nullptr); + DOCTEST_CHECK(preparedModel.get() != nullptr); android::sp<ExecutionCallback> cb(new ExecutionCallback()); V1_0::ErrorStatus execStatus = preparedModel->execute(request, cb); - CHECK((int)execStatus == (int)expectedStatus); + DOCTEST_CHECK((int)execStatus == (int)expectedStatus); ALOGI("Execute: waiting for callback to be invoked"); cb->wait(); return execStatus; @@ -243,10 +242,10 @@ V1_0::ErrorStatus Execute(android::sp<V1_0::IPreparedModel> preparedModel, android::sp<ExecutionCallback> ExecuteNoWait(android::sp<V1_0::IPreparedModel> preparedModel, const V1_0::Request& request) { - CHECK(preparedModel.get() != nullptr); + DOCTEST_CHECK(preparedModel.get() != nullptr); android::sp<ExecutionCallback> cb(new ExecutionCallback()); V1_0::ErrorStatus execStatus = preparedModel->execute(request, cb); - CHECK((int)execStatus == (int)V1_0::ErrorStatus::NONE); + DOCTEST_CHECK((int)execStatus == (int)V1_0::ErrorStatus::NONE); ALOGI("ExecuteNoWait: returning callback object"); return cb; } |