diff options
| author | Xusong Wang <xusongw@google.com> | 2019-10-30 13:14:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-30 13:14:00 -0700 |
| commit | 7b7090e35146c0ea4d819b6779eaf1a4ddd9ca59 (patch) | |
| tree | d56b757cffcbe2c9e602867900c65eff074e1f16 | |
| parent | b34fce3c2a57b2e5148900f9699340ec63f671b6 (diff) | |
| parent | c2e7f83d9566b164d688ff26f49a08577ae947e4 (diff) | |
| download | ml-7b7090e35146c0ea4d819b6779eaf1a4ddd9ca59.tar.gz | |
Merge changes I77bc5b7c,I837d967d am: 54d0e55eba
am: c2e7f83d95
Change-Id: Ic56efb128f154cb9f270cbbdcf6cfa5722a98b54
| -rw-r--r-- | nn/runtime/test/Android.bp | 3 | ||||
| -rw-r--r-- | nn/tools/test_generator/test_harness/TestHarness.cpp | 2 |
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; } |