diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2016-01-11 14:18:52 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2016-01-11 14:19:32 +0000 |
| commit | 6a58d44dbe5897a05b34930ae50156ffbb15d592 (patch) | |
| tree | c43769012a893a5a3df5b8730817b9d6ffdc7437 | |
| parent | ae6f23c83e1c8dcfbc4f74186ea1a37f1044414b (diff) | |
| download | art-6a58d44dbe5897a05b34930ae50156ffbb15d592.tar.gz art-6a58d44dbe5897a05b34930ae50156ffbb15d592.tar.bz2 art-6a58d44dbe5897a05b34930ae50156ffbb15d592.zip | |
Fix "check" file, and mark test as failing on device.
Change-Id: Ie1f9a2e86f94ccc3c9859ac172ee4b3da0f85d63
| -rwxr-xr-x | test/143-string-value/check | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/test/143-string-value/check b/test/143-string-value/check index 865950026a..cdf7b783a3 100755 --- a/test/143-string-value/check +++ b/test/143-string-value/check @@ -15,6 +15,6 @@ # limitations under the License. # Strip run-specific numbers (pid and line number) -sed -e 's/^art E [0-9]\+ [0-9]\+ art\/runtime\/native\/java_lang_Class.cc:[0-9]\+\] //' "$2" > "$2.tmp" +sed -e 's/^art E[ ]\+[0-9]\+[ ]\+[0-9]\+ art\/runtime\/native\/java_lang_Class.cc:[0-9]\+\] //' "$2" > "$2.tmp" diff --strip-trailing-cr -q "$1" "$2.tmp" >/dev/null diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 2c16ab8845..010d0708c2 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -277,6 +277,16 @@ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,host,$(RUN_TYPES),$(PREBUILD_ TEST_ART_BROKEN_HOST_RUN_TESTS := +# 143-string-value tests for a LOG(E) tag, which is only supported on host. +TEST_ART_BROKEN_TARGET_RUN_TESTS := \ + 143-string-value \ + +ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,target,$(RUN_TYPES),$(PREBUILD_TYPES), \ + $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ + $(IMAGE_TYPES), $(PICTEST_TYPES), $(DEBUGGABLE_TYPES), $(TEST_ART_BROKEN_PREBUILD_RUN_TESTS), $(ALL_ADDRESS_SIZES)) + +TEST_ART_BROKEN_TARGET_RUN_TESTS := + # 554-jit-profile-file is disabled because it needs a primary oat file to know what it should save. TEST_ART_BROKEN_NO_PREBUILD_TESTS := \ 117-nopatchoat \ |