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

Commit 9bbc8cb5 authored by Slava Shklyaev's avatar Slava Shklyaev Committed by Automerger Merge Worker
Browse files

Merge "Log NNAPI VTS test case to logcat" into rvc-dev am: a6d65ad0 am:... 

Merge "Log NNAPI VTS test case to logcat" into rvc-dev am: a6d65ad0 am: 52692559 am: 2e53bff4 am: 5e311d7c

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

Change-Id: Ib0dd9a4e34960ae99829c2f48df8ea4242b9cee6
parents e40f41bd 5e311d7c

neuralnetworks/1.0/vts/functional/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -62,11 +62,12 @@ cc_test { 
    defaults: ["neuralnetworks_vts_functional_defaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTestHarness.cpp",

        "TestAssertions.cpp",

        "TestMain.cpp",

        "ValidateModel.cpp",

        "ValidateRequest.cpp",

        "VtsHalNeuralnetworks.cpp",

        "GeneratedTestHarness.cpp",

    ],

    shared_libs: [

        "libfmq",

neuralnetworks/1.0/vts/functional/TestMain.cpp

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gtest/gtest.h>

#include "1.0/LogTestCaseToLogcat.h"



int main(int argc, char** argv) {

    testing::InitGoogleTest(&argc, argv);

    testing::UnitTest::GetInstance()->listeners().Append(

            new android::hardware::neuralnetworks::LogTestCaseToLogcat());

    return RUN_ALL_TESTS();

}

neuralnetworks/1.0/vts/functional/include/1.0/LogTestCaseToLogcat.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_NEURALNETWORKS_V1_0_LOG_TEST_CASE_TO_LOGCAT_H

#define ANDROID_HARDWARE_NEURALNETWORKS_V1_0_LOG_TEST_CASE_TO_LOGCAT_H



#include <android-base/logging.h>

#include <gtest/gtest.h>



namespace android::hardware::neuralnetworks {



class LogTestCaseToLogcat : public ::testing::EmptyTestEventListener {

  public:

    void OnTestStart(const ::testing::TestInfo& test_info) override {

        LOG(INFO) << "[Test Case] " << test_info.test_suite_name() << "." << test_info.name()

                  << " BEGIN";

    }



    void OnTestEnd(const ::testing::TestInfo& test_info) override {

        LOG(INFO) << "[Test Case] " << test_info.test_suite_name() << "." << test_info.name()

                  << " END";

    }

};



}  // namespace android::hardware::neuralnetworks



#endif  // ANDROID_HARDWARE_NEURALNETWORKS_V1_0_LOG_TEST_CASE_TO_LOGCAT_H

neuralnetworks/1.1/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ cc_test { 
    srcs: [

        "BasicTests.cpp",

        "TestAssertions.cpp",

        "TestMain.cpp",

        "ValidateModel.cpp",

        "ValidateRequest.cpp",

        "VtsHalNeuralnetworks.cpp",

neuralnetworks/1.1/vts/functional/TestMain.cpp

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gtest/gtest.h>

#include "1.0/LogTestCaseToLogcat.h"



int main(int argc, char** argv) {

    testing::InitGoogleTest(&argc, argv);

    testing::UnitTest::GetInstance()->listeners().Append(

            new android::hardware::neuralnetworks::LogTestCaseToLogcat());

    return RUN_ALL_TESTS();

}