diff options
| author | Miao Wang <miaowang@google.com> | 2019-02-01 14:00:08 -0800 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2019-02-13 14:21:22 -0800 |
| commit | 6e06a5ce410f85aa8f888a0cb54115e54bd729ef (patch) | |
| tree | 2ab9d6c3d56665630a207b042c2042a2f9d84f8c /neuralnetworks | |
| parent | 3c2716650521f782e420d4ba424ceb5369224052 (diff) | |
| download | platform_hardware_interfaces-6e06a5ce410f85aa8f888a0cb54115e54bd729ef.tar.gz platform_hardware_interfaces-6e06a5ce410f85aa8f888a0cb54115e54bd729ef.tar.bz2 platform_hardware_interfaces-6e06a5ce410f85aa8f888a0cb54115e54bd729ef.zip | |
Fix the usage of GTEST_SKIP
Test: mm
Test: VtsHalNeuralnetworksV1_0TargetTest
Change-Id: I6baaf54c626778129c1aab4f6622af570b34ec3f
Merged-In: I6baaf54c626778129c1aab4f6622af570b34ec3f
(cherry picked from commit 4135a8e94c9d81856beec036d9910def878918c5)
Diffstat (limited to 'neuralnetworks')
| -rw-r--r-- | neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp index 2e1385497b..0724c09ece 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp @@ -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 " "prepare model that it does not support." << std::endl; - GTEST_SKIP(); + return; } EXPECT_EQ(ErrorStatus::NONE, prepareReturnStatus); 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(); sp<V1_2::IPreparedModel> preparedModel = nullptr; PrepareModel(device, model, &preparedModel); + if (preparedModel == nullptr) { + GTEST_SKIP(); + } EvaluatePreparedModel(preparedModel, is_ignored, examples, model.relaxComputationFloat32toFloat16, testDynamicOutputShape); } |