From d895961d07a1d320b29f2045a48bc5a1944a4d3c Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Sun, 27 Dec 2015 15:46:35 +0000 Subject: [PATCH] Tweaks to get vogar runs working after enso move. - Use ART_TEST_ANDROID_ROOT for the dex locations, so that ART can find resources. - Use the pre-compiled boot image to avoid b/26320300. - Add new failures to failures file. bug:26320300 Change-Id: I08653b563f837a7ac3a014424951417f6bdd3294 --- build/Android.common_path.mk | 4 +++ tools/libcore_failures.txt | 63 ++++++++++++++++++++++++++++++++++++++++++++ tools/run-jdwp-tests.sh | 3 +-- tools/run-libcore-tests.sh | 6 +---- 4 files changed, 69 insertions(+), 7 deletions(-) diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 7fd2a5acb..81cd6efbe 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -84,7 +84,11 @@ TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS)) HOST_CORE_DEX_LOCATIONS := $(foreach jar,$(HOST_CORE_JARS), $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar) +ifeq ($(ART_TEST_ANDROID_ROOT),) TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(jar).jar) +else +TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_JARS),$(ART_TEST_ANDROID_ROOT)/framework/$(jar).jar) +endif HOST_CORE_DEX_FILES := $(foreach jar,$(HOST_CORE_JARS), $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),t,COMMON)/javalib.jar) TARGET_CORE_DEX_FILES := $(foreach jar,$(TARGET_CORE_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar), ,COMMON)/javalib.jar) diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt index b323456dd..3f95dbdfc 100644 --- a/tools/libcore_failures.txt +++ b/tools/libcore_failures.txt @@ -176,5 +176,68 @@ result: EXEC_FAILED, names: ["jsr166.LinkedTransferQueueTest#testTransfer2"], bug: 25883050 +}, +{ + description: "Failing tests after enso move.", + result: EXEC_FAILED, + bug: 26326992, + names: ["libcore.icu.RelativeDateTimeFormatterTest#test_getRelativeDateTimeStringDST", + "libcore.java.lang.OldSystemTest#test_load", + "libcore.java.text.NumberFormatTest#test_currencyWithPatternDigits", + "libcore.java.text.NumberFormatTest#test_customCurrencySymbol", + "libcore.java.text.NumberFormatTest#test_setCurrency", + "libcore.java.text.OldNumberFormatTest#test_getIntegerInstanceLjava_util_Locale", + "libcore.java.util.CalendarTest#testAddOneDayAndOneDayOver30MinuteDstForwardAdds48Hours", + "libcore.java.util.CalendarTest#testNewCalendarKoreaIsSelfConsistent", + "libcore.java.util.CalendarTest#testSetTimeInZoneWhereDstIsNoLongerUsed", + "libcore.java.util.CalendarTest#test_nullLocale", + "libcore.java.util.FormatterTest#test_numberLocalization", + "libcore.java.util.FormatterTest#test_uppercaseConversions", + "libcore.java.util.TimeZoneTest#testTimeZoneIDLocalization", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testClear", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testExportNode", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testExportSubtree", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGet", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetBoolean", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetByteArray", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetDouble", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetFloat", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetInt", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetLong", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testKeys", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testNodeExists", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPut", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutBoolean", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutByteArray", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutDouble", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutFloat", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutInt", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutLong", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testRemove", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testRemoveNode", + "libcore.java.util.prefs.OldAbstractPreferencesTest#testSync", + "libcore.java.util.prefs.PreferencesTest#testHtmlEncoding", + "libcore.java.util.prefs.PreferencesTest#testPreferencesClobbersExistingFiles", + "libcore.javax.crypto.CipherTest#testCipher_getInstance_WrongType_Failure", + "libcore.javax.crypto.CipherTest#testDecryptBufferZeroSize_mustDecodeToEmptyString", + "libcore.javax.security.auth.x500.X500PrincipalTest#testExceptionsForWrongDNs", + "org.apache.harmony.luni.tests.java.net.URLConnectionTest#test_getDate", + "org.apache.harmony.luni.tests.java.net.URLConnectionTest#test_getExpiration", + "org.apache.harmony.regex.tests.java.util.regex.PatternSyntaxExceptionTest#testPatternSyntaxException", + "org.apache.harmony.tests.java.lang.Character_UnicodeBlockTest#test_forNameLjava_lang_StringExceptions", + "org.apache.harmony.tests.java.lang.FloatTest#test_parseFloat_LString_Harmony6261", + "org.apache.harmony.tests.java.lang.ThreadTest#test_isDaemon", + "org.apache.harmony.tests.java.text.DecimalFormatSymbolsTest#test_setInternationalCurrencySymbolLjava_lang_String", + "org.apache.harmony.tests.java.text.DecimalFormatTest#testSerializationHarmonyRICompatible", + "org.apache.harmony.tests.java.text.SimpleDateFormatTest#test_parseLjava_lang_StringLjava_text_ParsePosition", + "org.apache.harmony.tests.java.util.CalendarTest#test_getDisplayNamesIILjava_util_Locale", + "org.apache.harmony.tests.java.util.PropertiesTest#test_storeToXMLLjava_io_OutputStreamLjava_lang_StringLjava_lang_String", + "org.apache.harmony.tests.java.util.jar.JarFileTest#test_getInputStreamLjava_util_jar_JarEntry_subtest0", + "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testExportNode", + "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testExportSubtree", + "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testFlush", + "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testSync", + "org.apache.harmony.tests.java.util.prefs.FilePreferencesImplTest#testPutGet"] } + ] diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index c79f4b9e2..840fffbd2 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -64,8 +64,7 @@ while true; do # with mksh. art="bash ${OUT_DIR-out}/host/linux-x86/bin/art" art_debugee="bash ${OUT_DIR-out}/host/linux-x86/bin/art" - # We force generation of a new image to avoid build-time and run-time classpath differences. - image="-Ximage:/system/non/existent" + image="-Ximage:${ANDROID_BUILD_TOP}/${OUT_DIR-out}/host/linux-x86/framework/core-jit.art" # We do not need a device directory on host. device_dir="" # Vogar knows which VM to use on host. diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 4b5a5ca76..3c93f196d 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -79,11 +79,7 @@ while true; do vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core-optimizing.art" shift elif [[ "$1" == "--mode=host" ]]; then - # We explicitly give a wrong path for the image, to ensure vogar - # will create a boot image with the default compiler. Note that - # giving an existing image on host does not work because of - # classpath/resources differences when compiling the boot image. - vogar_args="$vogar_args --vm-arg -Ximage:/non/existent" + vogar_args="$vogar_args --vm-arg -Ximage:${ANDROID_BUILD_TOP}/${OUT_DIR-out}/host/linux-x86/framework/core-jit.art" shift elif [[ "$1" == "--debug" ]]; then # Remove the --debug from the arguments. -- 2.11.0