Merge "Add presubmit tests to NNAPI -- hardware/interfaces/neuralnetworks"
diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp
index 52d6328..9057695 100644
--- a/neuralnetworks/1.0/vts/functional/Android.bp
+++ b/neuralnetworks/1.0/vts/functional/Android.bp
@@ -80,6 +80,7 @@
},
},
},
+ test_suites: ["general-tests"],
}
cc_test {
@@ -89,5 +90,16 @@
"BasicTests.cpp",
"GeneratedTests.cpp",
],
- test_suites: ["general-tests"],
+}
+
+cc_test {
+ name: "PresubmitHalNeuralnetworksV1_0TargetTest",
+ defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],
+ srcs: [
+ "BasicTests.cpp",
+ "GeneratedTests.cpp",
+ ],
+ cflags: [
+ "-DPRESUBMIT_NOT_VTS",
+ ],
}
diff --git a/neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp b/neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp
index 9ebc0aa..8883057 100644
--- a/neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp
+++ b/neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworks.cpp
@@ -49,7 +49,17 @@
void NeuralnetworksHidlTest::SetUp() {
::testing::VtsHalHidlTargetTestBase::SetUp();
device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(
- NeuralnetworksHidlEnvironment::getInstance());
+ NeuralnetworksHidlEnvironment::getInstance());
+
+#ifdef PRESUBMIT_NOT_VTS
+ const std::string name =
+ NeuralnetworksHidlEnvironment::getInstance()->getServiceName<IDevice>();
+ const std::string sampleDriver = "sample-";
+ if (device == nullptr && name.substr(0, sampleDriver.size()) == sampleDriver) {
+ GTEST_SKIP();
+ }
+#endif // PRESUBMIT_NOT_VTS
+
ASSERT_NE(nullptr, device.get());
}
diff --git a/neuralnetworks/1.1/vts/functional/Android.bp b/neuralnetworks/1.1/vts/functional/Android.bp
index 3f0c256..4fbeac9 100644
--- a/neuralnetworks/1.1/vts/functional/Android.bp
+++ b/neuralnetworks/1.1/vts/functional/Android.bp
@@ -21,7 +21,6 @@
srcs: [
"GeneratedTestsV1_0.cpp",
],
- test_suites: ["general-tests"],
}
// Tests for V1_1 models.
@@ -32,5 +31,16 @@
"BasicTests.cpp",
"GeneratedTests.cpp",
],
- test_suites: ["general-tests"],
+}
+
+cc_test {
+ name: "PresubmitHalNeuralnetworksV1_1TargetTest",
+ defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],
+ srcs: [
+ "BasicTests.cpp",
+ "GeneratedTests.cpp",
+ ],
+ cflags: [
+ "-DPRESUBMIT_NOT_VTS",
+ ],
}
diff --git a/neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp b/neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp
index 4165953..224a51d 100644
--- a/neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp
+++ b/neuralnetworks/1.1/vts/functional/VtsHalNeuralnetworks.cpp
@@ -49,7 +49,17 @@
void NeuralnetworksHidlTest::SetUp() {
::testing::VtsHalHidlTargetTestBase::SetUp();
device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(
- NeuralnetworksHidlEnvironment::getInstance());
+ NeuralnetworksHidlEnvironment::getInstance());
+
+#ifdef PRESUBMIT_NOT_VTS
+ const std::string name =
+ NeuralnetworksHidlEnvironment::getInstance()->getServiceName<IDevice>();
+ const std::string sampleDriver = "sample-";
+ if (device == nullptr && name.substr(0, sampleDriver.size()) == sampleDriver) {
+ GTEST_SKIP();
+ }
+#endif // PRESUBMIT_NOT_VTS
+
ASSERT_NE(nullptr, device.get());
}
diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp
index 510a0d5..891b414 100644
--- a/neuralnetworks/1.2/vts/functional/Android.bp
+++ b/neuralnetworks/1.2/vts/functional/Android.bp
@@ -24,7 +24,6 @@
cflags: [
"-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
],
- test_suites: ["general-tests"],
}
// Tests for V1_1 models using the V1_2 HAL.
@@ -37,7 +36,6 @@
cflags: [
"-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
],
- test_suites: ["general-tests"],
}
// Tests for V1_2 models.
@@ -52,5 +50,17 @@
cflags: [
"-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
],
- test_suites: ["general-tests"],
+}
+
+cc_test {
+ name: "PresubmitHalNeuralnetworksV1_2TargetTest",
+ defaults: ["VtsHalNeuralNetworksTargetTestDefaults"],
+ srcs: [
+ "BasicTests.cpp",
+ "GeneratedTests.cpp",
+ ],
+ cflags: [
+ "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE",
+ "-DPRESUBMIT_NOT_VTS",
+ ],
}
diff --git a/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.cpp b/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.cpp
index 34c73ef..4728c28 100644
--- a/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.cpp
+++ b/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.cpp
@@ -49,7 +49,17 @@
void NeuralnetworksHidlTest::SetUp() {
::testing::VtsHalHidlTargetTestBase::SetUp();
device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(
- NeuralnetworksHidlEnvironment::getInstance());
+ NeuralnetworksHidlEnvironment::getInstance());
+
+#ifdef PRESUBMIT_NOT_VTS
+ const std::string name =
+ NeuralnetworksHidlEnvironment::getInstance()->getServiceName<IDevice>();
+ const std::string sampleDriver = "sample-";
+ if (device == nullptr && name.substr(0, sampleDriver.size()) == sampleDriver) {
+ GTEST_SKIP();
+ }
+#endif // PRESUBMIT_NOT_VTS
+
ASSERT_NE(nullptr, device.get());
}
diff --git a/neuralnetworks/TEST_MAPPING b/neuralnetworks/TEST_MAPPING
new file mode 100644
index 0000000..50b6c19
--- /dev/null
+++ b/neuralnetworks/TEST_MAPPING
@@ -0,0 +1,28 @@
+{
+ "presubmit": [
+ {
+ "name": "PresubmitHalNeuralnetworksV1_0TargetTest",
+ "options": [
+ {
+ "native-test-flag": "--hal_service_instance=android.hardware.neuralnetworks@1.0::IDevice/sample-all"
+ }
+ ]
+ },
+ {
+ "name": "PresubmitHalNeuralnetworksV1_1TargetTest",
+ "options": [
+ {
+ "native-test-flag": "--hal_service_instance=android.hardware.neuralnetworks@1.1::IDevice/sample-all"
+ }
+ ]
+ },
+ {
+ "name": "PresubmitHalNeuralnetworksV1_2TargetTest",
+ "options": [
+ {
+ "native-test-flag": "--hal_service_instance=android.hardware.neuralnetworks@1.2::IDevice/sample-all"
+ }
+ ]
+ }
+ ]
+}