diff options
| author | Chih-hung Hsieh <chh@google.com> | 2022-02-24 01:32:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-24 01:32:09 +0000 |
| commit | 34593d4e2a2699f9ddd8f89e78d69684eb16e6a3 (patch) | |
| tree | 957cee6f2f51ba1526322600e10f3ba1f45238f8 /neuralnetworks | |
| parent | 0bd7074e39ae10525a16b41337b1f2c34d6f4d11 (diff) | |
| parent | 581616e658f5a7834f86794a60ecece4da11f614 (diff) | |
Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f am: fa83970b3a am: 581616e658
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1992232
Change-Id: I2eac13fe3b5ab0b4f15d6ceadf376e5e74124a81
Diffstat (limited to 'neuralnetworks')
| -rw-r--r-- | neuralnetworks/1.2/utils/Android.bp | 4 | ||||
| -rw-r--r-- | neuralnetworks/1.2/vts/functional/Android.bp | 3 | ||||
| -rw-r--r-- | neuralnetworks/1.3/utils/Android.bp | 4 | ||||
| -rw-r--r-- | neuralnetworks/1.3/vts/functional/Android.bp | 4 | ||||
| -rw-r--r-- | neuralnetworks/aidl/utils/Android.bp | 4 | ||||
| -rw-r--r-- | neuralnetworks/aidl/vts/functional/Android.bp | 4 | ||||
| -rw-r--r-- | neuralnetworks/utils/common/Android.bp | 1 |
7 files changed, 24 insertions, 0 deletions
diff --git a/neuralnetworks/1.2/utils/Android.bp b/neuralnetworks/1.2/utils/Android.bp index 4c5f065dda..57450d9733 100644 --- a/neuralnetworks/1.2/utils/Android.bp +++ b/neuralnetworks/1.2/utils/Android.bp @@ -60,6 +60,10 @@ cc_library_static { cc_test { name: "neuralnetworks_utils_hal_1_2_test", host_supported: true, + tidy_timeout_srcs: [ + "test/DeviceTest.cpp", + "test/PreparedModelTest.cpp", + ], srcs: ["test/*.cpp"], static_libs: [ "android.hardware.neuralnetworks@1.0", diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp index 52d51e2ce9..2177924d30 100644 --- a/neuralnetworks/1.2/vts/functional/Android.bp +++ b/neuralnetworks/1.2/vts/functional/Android.bp @@ -44,6 +44,9 @@ cc_library_static { cc_test { name: "VtsHalNeuralnetworksV1_2TargetTest", defaults: ["neuralnetworks_vts_functional_defaults"], + tidy_timeout_srcs: [ + "CompilationCachingTests.cpp", + ], srcs: [ "BasicTests.cpp", "CompilationCachingTests.cpp", diff --git a/neuralnetworks/1.3/utils/Android.bp b/neuralnetworks/1.3/utils/Android.bp index c512dda772..aa03fea01c 100644 --- a/neuralnetworks/1.3/utils/Android.bp +++ b/neuralnetworks/1.3/utils/Android.bp @@ -57,6 +57,10 @@ cc_library_static { cc_test { name: "neuralnetworks_utils_hal_1_3_test", host_supported: true, + tidy_timeout_srcs: [ + "test/DeviceTest.cpp", + "test/PreparedModelTest.cpp", + ], srcs: ["test/*.cpp"], static_libs: [ "android.hardware.neuralnetworks@1.0", diff --git a/neuralnetworks/1.3/vts/functional/Android.bp b/neuralnetworks/1.3/vts/functional/Android.bp index 89517602d2..9fa0f0a174 100644 --- a/neuralnetworks/1.3/vts/functional/Android.bp +++ b/neuralnetworks/1.3/vts/functional/Android.bp @@ -45,6 +45,10 @@ cc_library_static { cc_test { name: "VtsHalNeuralnetworksV1_3TargetTest", defaults: ["neuralnetworks_vts_functional_defaults"], + tidy_timeout_srcs: [ + "CompilationCachingTests.cpp", + "MemoryDomainTests.cpp", + ], srcs: [ "BasicTests.cpp", "CompilationCachingTests.cpp", diff --git a/neuralnetworks/aidl/utils/Android.bp b/neuralnetworks/aidl/utils/Android.bp index 9148eaccdf..4d524eed05 100644 --- a/neuralnetworks/aidl/utils/Android.bp +++ b/neuralnetworks/aidl/utils/Android.bp @@ -105,6 +105,10 @@ cc_test { "neuralnetworks_use_latest_utils_hal_aidl", "neuralnetworks_utils_defaults", ], + tidy_timeout_srcs: [ + "test/DeviceTest.cpp", + "test/PreparedModelTest.cpp", + ], srcs: [ "test/*.cpp", ], diff --git a/neuralnetworks/aidl/vts/functional/Android.bp b/neuralnetworks/aidl/vts/functional/Android.bp index 356cdb0956..04b4a45d8f 100644 --- a/neuralnetworks/aidl/vts/functional/Android.bp +++ b/neuralnetworks/aidl/vts/functional/Android.bp @@ -31,6 +31,10 @@ cc_test { "use_libaidlvintf_gtest_helper_static", ], host_supported: true, + tidy_timeout_srcs: [ + "CompilationCachingTests.cpp", + "MemoryDomainTests.cpp", + ], srcs: [ "BasicTests.cpp", "Callbacks.cpp", diff --git a/neuralnetworks/utils/common/Android.bp b/neuralnetworks/utils/common/Android.bp index bfba24fc1f..91fca2fba2 100644 --- a/neuralnetworks/utils/common/Android.bp +++ b/neuralnetworks/utils/common/Android.bp @@ -36,6 +36,7 @@ cc_library_static { cc_test { name: "neuralnetworks_utils_hal_common_test", host_supported: true, + tidy_timeout_srcs: ["test/ResilientDeviceTest.cpp"], srcs: ["test/*.cpp"], static_libs: [ "libgmock", |