Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77c62d11 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Quick-fail NNAPI VTS test case if driver is dead" am: 994a3856 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1806419

Change-Id: Ia14cfc51ae570c7bcef90b765ec5ac15e7d8afe6
parents d418a199 994a3856

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ void Execute(const sp<IDevice>& device, const TestModel& testModel) { 
void GeneratedTestBase::SetUp() {

    testing::TestWithParam<GeneratedTestParam>::SetUp();

    ASSERT_NE(kDevice, nullptr);

    const bool deviceIsResponsive = kDevice->ping().isOk();

    ASSERT_TRUE(deviceIsResponsive);

}



std::vector<NamedModel> getNamedModels(const FilterFn& filter) {

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ void createPreparedModel(const sp<IDevice>& device, const Model& model, 
void NeuralnetworksHidlTest::SetUp() {

    testing::TestWithParam<NeuralnetworksHidlTestParam>::SetUp();

    ASSERT_NE(kDevice, nullptr);

    const bool deviceIsResponsive = kDevice->ping().isOk();

    ASSERT_TRUE(deviceIsResponsive);

}



static NamedDevice makeNamedDevice(const std::string& name) {

neuralnetworks/1.1/vts/functional/GeneratedTestHarness.cpp

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ void Execute(const sp<IDevice>& device, const TestModel& testModel) { 
void GeneratedTestBase::SetUp() {

    testing::TestWithParam<GeneratedTestParam>::SetUp();

    ASSERT_NE(kDevice, nullptr);

    const bool deviceIsResponsive = kDevice->ping().isOk();

    ASSERT_TRUE(deviceIsResponsive);

}



std::vector<NamedModel> getNamedModels(const FilterFn& filter) {

neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ void createPreparedModel(const sp<IDevice>& device, const Model& model, 
void NeuralnetworksHidlTest::SetUp() {

    testing::TestWithParam<NeuralnetworksHidlTestParam>::SetUp();

    ASSERT_NE(kDevice, nullptr);

    const bool deviceIsResponsive = kDevice->ping().isOk();

    ASSERT_TRUE(deviceIsResponsive);

}



static NamedDevice makeNamedDevice(const std::string& name) {

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ class CompilationCachingTestBase : public testing::Test { 
    void SetUp() override {

        testing::Test::SetUp();

        ASSERT_NE(kDevice.get(), nullptr);

        const bool deviceIsResponsive = kDevice->ping().isOk();

        ASSERT_TRUE(deviceIsResponsive);



        // Create cache directory. The cache directory and a temporary cache file is always created

        // to test the behavior of prepareModelFromCache, even when caching is not supported.