summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXusong Wang <xusongw@google.com>2019-10-30 13:08:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 13:08:07 -0700
commitc2e7f83d9566b164d688ff26f49a08577ae947e4 (patch)
treed56b757cffcbe2c9e602867900c65eff074e1f16
parentcb060fcfee67e51e664dc80006026042bc229aac (diff)
parent54d0e55ebace54f589566dfe14fbc1fee66d2235 (diff)
downloadml-c2e7f83d9566b164d688ff26f49a08577ae947e4.tar.gz
Merge changes I77bc5b7c,I837d967d
am: 54d0e55eba Change-Id: Ice56b49df57616781b2641f125aac127e84b9eb6
-rw-r--r--nn/runtime/test/Android.bp3
-rw-r--r--nn/tools/test_generator/test_harness/TestHarness.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/nn/runtime/test/Android.bp b/nn/runtime/test/Android.bp
index 608172e58..35f12293b 100644
--- a/nn/runtime/test/Android.bp
+++ b/nn/runtime/test/Android.bp
@@ -65,7 +65,8 @@ cc_defaults {
"TestOperandExtraParams.cpp",
"TestTrivialModel.cpp",
"TestUnknownDimensions.cpp",
- "TestUnspecifiedDimensions.cpp",
+ // TODO(xusongw): Re-enable once b/141294076 is fixed.
+ // "TestUnspecifiedDimensions.cpp",
"TestValidateModel.cpp",
"TestValidateOperations.cpp",
"TestValidation.cpp",
diff --git a/nn/tools/test_generator/test_harness/TestHarness.cpp b/nn/tools/test_generator/test_harness/TestHarness.cpp
index 7def61195..7bdb2dc20 100644
--- a/nn/tools/test_generator/test_harness/TestHarness.cpp
+++ b/nn/tools/test_generator/test_harness/TestHarness.cpp
@@ -46,7 +46,7 @@ int getQuant8AllowedError() {
if (testName.find("mobilenet") != std::string::npos ||
(testCaseName.find("CompilationCaching") != std::string::npos &&
testName.find("TOCTOU") == std::string::npos)) {
- return 2;
+ return 3;
} else {
return 1;
}