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

Commit 4a8246e3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15687253, 15687254, 15687255, 15687532, 15687533] into sc-release 

Change-Id: I72e5e9548cccf9e9ba6d57c8f9e335cf9a979753
parents ca8a2dba 50dd1b9e

neuralnetworks/1.0/vts/functional/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalNeuralnetworksV1_0TargetTest" />

        <option name="native-test-timeout" value="20m" />

        <option name="native-test-flag" value="--gtest_break_on_failure" />

    </test>

</configuration>

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/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalNeuralnetworksV1_1TargetTest" />

        <option name="native-test-timeout" value="20m" />

        <option name="native-test-flag" value="--gtest_break_on_failure" />

    </test>

</configuration>

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) {