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

Commit 9c3c8642 authored by Michael Butler's avatar Michael Butler
Browse files

Quick-fail NNAPI VTS test case if driver is dead 

This CL adds a check during SetUp that an NNAPI driver service is still
alive by pinging the driver service. If it is not alive, the test will
fail during SetUp. Without this quick-fail, the test case would continue
as if the driver were still active, which would result in multiple
EXPECT_* and ASSERT_* statements failing instead of a single, clear
failure message.

Bug: 197035200
Test: mma
Test: presubmit: VtsHalNeuralnetworks*TargetTest
Change-Id: Ib1b75ed20f764055699590581d5ad4e5aff4baae
parent 0f239372

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.