Fix the usage of GTEST_SKIP

am: 6e06a5ce41

Change-Id: Ib0b31d572ac4d9bf6770c574630dae64e9ab386c
This commit is contained in:
Miao Wang
2019-02-13 16:19:32 -08:00
committed by android-build-merger

View File

@@ -548,7 +548,7 @@ void PrepareModel(const sp<V1_2::IDevice>& device, const V1_2::Model& model,
std::cout << "[ ] Early termination of test because vendor service cannot " std::cout << "[ ] Early termination of test because vendor service cannot "
"prepare model that it does not support." "prepare model that it does not support."
<< std::endl; << std::endl;
GTEST_SKIP(); return;
} }
EXPECT_EQ(ErrorStatus::NONE, prepareReturnStatus); EXPECT_EQ(ErrorStatus::NONE, prepareReturnStatus);
ASSERT_NE(nullptr, preparedModel->get()); ASSERT_NE(nullptr, preparedModel->get());
@@ -561,6 +561,9 @@ void Execute(const sp<V1_2::IDevice>& device, std::function<V1_2::Model(void)> c
V1_2::Model model = create_model(); V1_2::Model model = create_model();
sp<V1_2::IPreparedModel> preparedModel = nullptr; sp<V1_2::IPreparedModel> preparedModel = nullptr;
PrepareModel(device, model, &preparedModel); PrepareModel(device, model, &preparedModel);
if (preparedModel == nullptr) {
GTEST_SKIP();
}
EvaluatePreparedModel(preparedModel, is_ignored, examples, EvaluatePreparedModel(preparedModel, is_ignored, examples,
model.relaxComputationFloat32toFloat16, testDynamicOutputShape); model.relaxComputationFloat32toFloat16, testDynamicOutputShape);
} }