From: Sebastien Hertz <shertz@google.com>
Date: Wed, 23 Mar 2016 08:04:17 +0000 (+0000)
Subject: Merge "Update run-test 097-duplicate-method"
X-Git-Tag: android-x86-7.1-r1~312^2~4^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9b6bea979ee9a450ebc4b5611514ba3f82f24d8;p=android-x86%2Fart.git

Merge "Update run-test 097-duplicate-method"
---

e9b6bea979ee9a450ebc4b5611514ba3f82f24d8
diff --cc test/Android.run-test.mk
index 74ec330c9,2097256ea..f30ce3911
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@@ -218,14 -221,10 +218,12 @@@ ART_TEST_KNOWN_BROKEN += $(call all-run
          $(IMAGE_TYPES), $(PICTEST_TYPES), $(DEBUGGABLE_TYPES), $(ART_TEST_RUN_TEST_SKIP), $(ALL_ADDRESS_SIZES))
  
  
- # Disable 097-duplicate-method while investigation (broken by latest Jack release, b/27358065)
  # Disable 137-cfi (b/27391690).
  # Disable 577-profile-foreign-dex (b/27454772).
 +# Disable 117-nopatchoat for investigation (b/27689078).
  TEST_ART_BROKEN_ALL_TARGET_TESTS := \
-   097-duplicate-method \
    577-profile-foreign-dex \
 +  117-nopatchoat \
  
  ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
      $(COMPILER_TYPES), $(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \