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

Commit 641f446a authored by Miao Wang's avatar Miao Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix the usage of GTEST_SKIP"

parents f0257be4 4135a8e9

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -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);

}

}