From 3722d6dcfae47d0e92c495d0fe81b7ff133d51ef Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Tue, 16 Jun 2020 16:43:01 +0100 Subject: [PATCH] Log NNAPI VTS test case to logcat Sample output: I VtsHalNeuralnetworksV1_2TargetTest: [Test Case] TestGenerated/GeneratedTest.Test/nnapi_sample_all_add BEGIN ... I VtsHalNeuralnetworksV1_2TargetTest: [Test Case] TestGenerated/GeneratedTest.Test/nnapi_sample_all_add END Bug: 159060565 Test: VtsHalNeuralnetworksV1_0TargetTest (inspected logcat output) Test: VtsHalNeuralnetworksV1_1TargetTest (inspected logcat output) Test: VtsHalNeuralnetworksV1_2TargetTest (inspected logcat output) Test: VtsHalNeuralnetworksV1_3TargetTest (inspected logcat output) Change-Id: Ic1a0c90e0853ca84dd925d0f7df65e159bb284aa Merged-In: Ic1a0c90e0853ca84dd925d0f7df65e159bb284aa (cherry picked from commit 8c8efd68e8cafa6cf13221dcbf993bbca9dd924e) --- neuralnetworks/1.0/vts/functional/Android.bp | 3 +- .../1.0/vts/functional/TestMain.cpp | 25 ++++++++++++ .../include/1.0/LogTestCaseToLogcat.h | 40 +++++++++++++++++++ neuralnetworks/1.1/vts/functional/Android.bp | 1 + .../1.1/vts/functional/TestMain.cpp | 25 ++++++++++++ neuralnetworks/1.2/vts/functional/Android.bp | 1 + .../1.2/vts/functional/TestMain.cpp | 25 ++++++++++++ .../1.2/vts/functional/VtsHalNeuralnetworks.h | 1 + neuralnetworks/1.3/vts/functional/Android.bp | 1 + .../1.3/vts/functional/TestMain.cpp | 25 ++++++++++++ .../1.3/vts/functional/VtsHalNeuralnetworks.h | 1 + 11 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 neuralnetworks/1.0/vts/functional/TestMain.cpp create mode 100644 neuralnetworks/1.0/vts/functional/include/1.0/LogTestCaseToLogcat.h create mode 100644 neuralnetworks/1.1/vts/functional/TestMain.cpp create mode 100644 neuralnetworks/1.2/vts/functional/TestMain.cpp create mode 100644 neuralnetworks/1.3/vts/functional/TestMain.cpp diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp index 87e851930d..d802911234 100644 --- a/neuralnetworks/1.0/vts/functional/Android.bp +++ b/neuralnetworks/1.0/vts/functional/Android.bp @@ -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", diff --git a/neuralnetworks/1.0/vts/functional/TestMain.cpp b/neuralnetworks/1.0/vts/functional/TestMain.cpp new file mode 100644 index 0000000000..6bf4e5fab1 --- /dev/null +++ b/neuralnetworks/1.0/vts/functional/TestMain.cpp @@ -0,0 +1,25 @@ +/* + * 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 +#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(); +} diff --git a/neuralnetworks/1.0/vts/functional/include/1.0/LogTestCaseToLogcat.h b/neuralnetworks/1.0/vts/functional/include/1.0/LogTestCaseToLogcat.h new file mode 100644 index 0000000000..f1413ef1aa --- /dev/null +++ b/neuralnetworks/1.0/vts/functional/include/1.0/LogTestCaseToLogcat.h @@ -0,0 +1,40 @@ +/* + * 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 +#include + +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 diff --git a/neuralnetworks/1.1/vts/functional/Android.bp b/neuralnetworks/1.1/vts/functional/Android.bp index 9afa0af35b..405548fe55 100644 --- a/neuralnetworks/1.1/vts/functional/Android.bp +++ b/neuralnetworks/1.1/vts/functional/Android.bp @@ -20,6 +20,7 @@ cc_test { srcs: [ "BasicTests.cpp", "TestAssertions.cpp", + "TestMain.cpp", "ValidateModel.cpp", "ValidateRequest.cpp", "VtsHalNeuralnetworks.cpp", diff --git a/neuralnetworks/1.1/vts/functional/TestMain.cpp b/neuralnetworks/1.1/vts/functional/TestMain.cpp new file mode 100644 index 0000000000..6bf4e5fab1 --- /dev/null +++ b/neuralnetworks/1.1/vts/functional/TestMain.cpp @@ -0,0 +1,25 @@ +/* + * 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 +#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(); +} diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp index 182f716115..93edca6126 100644 --- a/neuralnetworks/1.2/vts/functional/Android.bp +++ b/neuralnetworks/1.2/vts/functional/Android.bp @@ -40,6 +40,7 @@ cc_test { "CompilationCachingTests.cpp", "GeneratedTestHarness.cpp", "TestAssertions.cpp", + "TestMain.cpp", "ValidateBurst.cpp", "ValidateModel.cpp", "ValidateRequest.cpp", diff --git a/neuralnetworks/1.2/vts/functional/TestMain.cpp b/neuralnetworks/1.2/vts/functional/TestMain.cpp new file mode 100644 index 0000000000..6bf4e5fab1 --- /dev/null +++ b/neuralnetworks/1.2/vts/functional/TestMain.cpp @@ -0,0 +1,25 @@ +/* + * 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 +#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(); +} diff --git a/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h b/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h index d01336eccd..c4e2b15d1c 100644 --- a/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h +++ b/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "1.0/Utils.h" #include "1.2/Callbacks.h" diff --git a/neuralnetworks/1.3/vts/functional/Android.bp b/neuralnetworks/1.3/vts/functional/Android.bp index 457e36ead5..0b8e68e3bc 100644 --- a/neuralnetworks/1.3/vts/functional/Android.bp +++ b/neuralnetworks/1.3/vts/functional/Android.bp @@ -43,6 +43,7 @@ cc_test { "MemoryDomainTests.cpp", "QualityOfServiceTests.cpp", "TestAssertions.cpp", + "TestMain.cpp", "ValidateBurst.cpp", "ValidateModel.cpp", "ValidateRequest.cpp", diff --git a/neuralnetworks/1.3/vts/functional/TestMain.cpp b/neuralnetworks/1.3/vts/functional/TestMain.cpp new file mode 100644 index 0000000000..6bf4e5fab1 --- /dev/null +++ b/neuralnetworks/1.3/vts/functional/TestMain.cpp @@ -0,0 +1,25 @@ +/* + * 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 +#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(); +} diff --git a/neuralnetworks/1.3/vts/functional/VtsHalNeuralnetworks.h b/neuralnetworks/1.3/vts/functional/VtsHalNeuralnetworks.h index de082c39cc..a2e5071d97 100644 --- a/neuralnetworks/1.3/vts/functional/VtsHalNeuralnetworks.h +++ b/neuralnetworks/1.3/vts/functional/VtsHalNeuralnetworks.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "1.0/Utils.h" #include "1.3/Callbacks.h"