Test Backports
Joe Darcy
joe.darcy at oracle.com
Wed Apr 7 18:20:41 PDT 2010
Andrew John Hughes wrote:
> On 7 April 2010 00:25, Joe Darcy <joe.darcy at oracle.com> wrote:
>
>> On 04/06/10 01:27 PM, Andrew John Hughes wrote:
>>
>> On 6 April 2010 01:43, Joe Darcy <joe.darcy at oracle.com> wrote:
>>
[snip]
>>
>>
>> On my queue, I have four more Zero patches and a set of backports I'd
>> like in (making the source/target explicit as we did in 7 already, and
>> Kelly's ant 1.8 patch). Everything else can wait until b20
>>
>>
>>
>> Here's the backport:
>>
>> http://cr.openjdk.java.net/~andrew/6873059/webrev.01/jdk6.patch
>>
>> It's a replica of 6873059 as applied to the HotSpot, JDK and CORBA
>> trees in OpenJDK7, the only difference being that we use 5 instead of
>> 6 as the bootstrap version for OpenJDK6. Ok to push? Should I use
>> the same bug ID or do you want to allocate a fresh one?
>>
>>
>> Using the same bug id is fine, but I'd like Kelly to sanity check it before
>> it goes back.
>>
>>
>
> Ok, waiting for Kelly's response.
>
Acknowledged.
>
>> On another note, there is now some code requiring source level 6 in
>> OpenJDK6 (due to use of the @Override annotation on interfaces):
>>
>> src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
>> src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
>> src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
>> src/share/classes/sun/security/provider/certpath/OCSPResponse.java
>> src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
>>
>>
>> There is an overly-long story behind -source 5 vs. -source 6 and @Override.
>> The short answer is that javac in JDK 6 unconditionally applies the more
>> liberal (and more useful) semantics for @Override. For the JDK sources, a
>> compiler that does the same should be used.
>>
>>
>
> Exactly. I know ecj throws it out for 5 but not for 6 and thus
> building using ecj (our method for bootstrapping) falls foul of the
> classes above. I'm not sure if javac is allowing them through because
> its version of 1.5 allows it or it is simply defaulting to 6 because
> nothing else is specified. I had a quick look but the version is
> currently set in more than one place, so I think this needs a more
> in-depth review and I'd prefer it waits until b20 to be on the safe
> side.
>
The javac command in JDK 6, both open and proprietary, will allow use of
@Override on interfaces, even if "-source 5" is specified.
>> So we should look at bumping the generated code version to 6 (it still
>> seems to be 5 even though this is OpenJDK6). I'd prefer to leave that
>> until b20 though.
>>
>> I see Kelly's patch went in. It would be nice to also backport
>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/5fdbe2cdf565 (a minor
>> warning fix) so IcedTea6's OpenJDK backport set is empty again.
>>
>>
>> I approve the warning fix being backported.
>>
>>
>
> Done: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/6ee696377676
>
Thanks,
> The first of the four Zero backports is 6903453: Zero build on ARM and IA-64.
>
> http://cr.openjdk.java.net/~andrew/6903453/webrev.01/
>
> It adds a few build conditionals for building on arm and ia64 platforms.
>
> Ok to push?
>
Approved to go back.
I've run some regression tests on a build from the current tip and the
result look good; in particular, all the rmid tests pass again :-)
Detailed diffs from b18:
0: ../test_results.b18/JTreport.hotspot pass: 24
1: JTreport.hotspot pass: 62
0 1 Test
--- pass compiler/5057225/Test5057225.java
--- pass compiler/6378821/Test6378821.java
--- pass compiler/6539464/Test.java
--- pass compiler/6589834/Test_ia32.java
--- pass compiler/6603011/Test.java
--- pass compiler/6636138/Test1.java
--- pass compiler/6636138/Test2.java
--- pass compiler/6711117/Test.java
--- pass compiler/6772683/InterruptedTest.java
--- pass compiler/6778657/Test.java
--- pass compiler/6795161/Test.java
--- pass compiler/6795465/Test6795465.java
--- pass compiler/6797305/Test6797305.java
--- pass compiler/6799693/Test.java
--- pass compiler/6800154/Test6800154.java
--- pass compiler/6814842/Test6814842.java
--- pass compiler/6823354/Test6823354.java
--- pass compiler/6823453/Test.java
--- pass compiler/6826736/Test.java
--- pass compiler/6832293/Test.java
--- pass compiler/6833129/Test.java
--- pass compiler/6837011/Test6837011.java
--- pass compiler/6837094/Test.java
--- pass compiler/6843752/Test.java
--- pass compiler/6849574/Test.java
--- pass compiler/6851282/Test.java
--- pass compiler/6852078/Test6852078.java
--- pass compiler/6855164/Test.java
--- pass compiler/6855215/Test6855215.java
--- pass compiler/6857159/Test6857159.java
--- pass compiler/6859338/Test6859338.java
--- pass compiler/6860469/Test.java
--- pass compiler/6863155/Test6863155.java
--- pass compiler/6863420/Test.java
--- pass compiler/6865031/Test.java
--- pass compiler/6875866/Test.java
--- pass compiler/6892265/Test.java
--- pass gc/6845368/bigobj.java
38 differences
Langtools:
0: ../test_results.b18/JTreport.langtools pass: 1,355
1: JTreport.langtools pass: 1,359
0 1 Test
--- pass tools/javac/enum/T6724345.java
--- pass tools/javac/processing/6511613/clss41701.java
--- pass tools/javac/processing/6634138/T6634138.java
--- pass tools/javac/processing/model/util/elements/VacuousEnum.java
4 differences
JDK:
0: ../test_results.b18/JTreport.jdk pass: 3,148; fail: 19; error: 2
1: JTreport.jdk pass: 3,252; fail: 29; error: 4
0 1 Test
pass fail com/sun/crypto/provider/KeyFactory/TestProviderLeak.java
--- error
java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
--- error
java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java
--- error
java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java
--- pass java/awt/Focus/NonFocusableWindowTest/Test.java
--- pass java/awt/Focus/TypeAhead/TestFocusFreeze.java
pass fail java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java
--- fail
java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
pass fail java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html
fail pass java/awt/event/KeyEvent/CorrectTime/CorrectTime.java
--- pass java/awt/xembed/server/RunTestXEmbed.java
--- pass java/nio/charset/Charset/AvailableCharsetNames.java
--- pass java/nio/charset/Charset/CharsetContainmentTest.java
--- fail java/nio/charset/Charset/Contains.java
--- pass java/nio/charset/Charset/EmptyCharsetName.java
--- pass java/nio/charset/Charset/EncDec.java
--- pass java/nio/charset/Charset/IllegalCharsetName.java
--- fail java/nio/charset/Charset/NIOCharsetAvailabilityTest.java
--- pass java/nio/charset/Charset/NullCharsetName.java
--- pass java/nio/charset/Charset/RegisteredCharsets.java
--- pass java/nio/charset/Charset/default.sh
--- pass java/nio/charset/CharsetDecoder/AverageMax.java
--- pass java/nio/charset/CharsetDecoder/EmptyInput.java
--- pass java/nio/charset/CharsetEncoder/CanEncode.java
--- pass java/nio/charset/CharsetEncoder/Flush.java
--- pass java/nio/charset/RemovingSunIO/SunioAlias.java
--- pass java/nio/charset/RemovingSunIO/TestCOMP.java
--- pass java/nio/charset/RemovingSunIO/TestUnmappableForLength.java
--- pass java/nio/charset/coders/BashCache.java
--- pass java/nio/charset/coders/BashStreams.java
--- pass java/nio/charset/coders/Check.java
--- pass java/nio/charset/coders/CheckSJISMappingProp.sh
--- pass java/nio/charset/coders/Errors.java
--- pass java/nio/charset/coders/FullRead.java
--- pass java/nio/charset/coders/IOCoders.java
--- pass java/nio/charset/coders/IsLegalReplacement.java
--- pass java/nio/charset/coders/ResetISO2022JP.java
--- pass java/nio/charset/coders/StreamTimeout.java
--- pass java/nio/charset/coders/Surrogates.java
--- pass java/nio/charset/spi/basic.sh
fail pass java/rmi/transport/pinLastArguments/PinLastArguments.java
--- pass java/text/Bidi/BidiBug.java
--- pass java/text/Bidi/BidiEmbeddingTest.java
--- pass java/text/Bidi/BidiSurrogateTest.java
--- pass java/util/prefs/CommentsInXml.java
--- pass java/util/prefs/ConflictInFlush.java
--- pass java/util/prefs/ExportNode.java
--- pass java/util/prefs/ExportSubtree.java
--- pass java/util/prefs/PrefsSpi.sh
--- pass java/util/prefs/RemoveReadOnlyNode.java
--- pass java/util/prefs/RemoveUnregedListener.java
--- pass java/util/prefs/SerializeExceptions.java
--- pass javax/swing/JColorChooser/Test4165217.java
--- pass javax/swing/JColorChooser/Test4177735.java
--- pass javax/swing/JColorChooser/Test4193384.java
--- pass javax/swing/JColorChooser/Test4234761.java
--- pass javax/swing/JColorChooser/Test4461329.java
--- pass javax/swing/JColorChooser/Test4711996.java
--- pass javax/swing/border/Test4120351.java
--- pass javax/swing/border/Test4124729.java
--- pass javax/swing/border/Test6461042.java
--- pass sun/nio/cs/BufferUnderflowEUCTWTest.java
--- pass sun/nio/cs/CheckCaseInsensitiveEncAliases.java
--- pass sun/nio/cs/CheckHistoricalNames.java
--- pass sun/nio/cs/ConvertSingle.java
--- pass sun/nio/cs/DecoderOverflow.java
--- pass sun/nio/cs/EUCJPUnderflowDecodeTest.java
--- pass sun/nio/cs/EucJpLinux0212.java
--- pass sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java
--- pass sun/nio/cs/EuroConverter.java
--- pass sun/nio/cs/FindASCIICodingBugs.java
--- pass sun/nio/cs/FindASCIIRangeCodingBugs.java
--- pass sun/nio/cs/FindCanEncodeBugs.java
--- pass sun/nio/cs/FindDecoderBugs.java
--- pass sun/nio/cs/FindEncoderBugs.java
--- pass sun/nio/cs/FindOneCharEncoderBugs.java
--- pass sun/nio/cs/HWKatakanaMS932EncodeTest.java
--- pass sun/nio/cs/ISCIITest.java
--- pass sun/nio/cs/ISO8859x.java
--- pass sun/nio/cs/JISAutoDetectTest.java
--- pass sun/nio/cs/LatinCharReplacementTWTest.java
--- pass sun/nio/cs/LeftOverSurrogate.java
--- pass sun/nio/cs/MalformedSurrogates.java
--- pass sun/nio/cs/NIOJISAutoDetectTest.java
--- pass sun/nio/cs/ReadZero.java
--- pass sun/nio/cs/SJISCanEncode.java
--- pass sun/nio/cs/StreamEncoderClose.java
--- pass sun/nio/cs/SurrogateGB18030Test.java
--- pass sun/nio/cs/SurrogateTestEUCTW.java
--- pass sun/nio/cs/SurrogateTestHKSCS.java
--- fail sun/nio/cs/Test4200310.sh
--- pass sun/nio/cs/Test4206507.java
--- pass sun/nio/cs/Test6254467.java
--- pass sun/nio/cs/Test6275027.java
--- pass sun/nio/cs/TestCompoundTest.java
--- pass sun/nio/cs/TestConverterDroppedCharacters.java
--- pass sun/nio/cs/TestCp834_SBCS.java
--- pass sun/nio/cs/TestCp93xSISO.java
--- pass sun/nio/cs/TestIBMBugs.java
--- pass sun/nio/cs/TestISCII91.java
--- pass sun/nio/cs/TestISO2022CNDecoder.java
--- pass sun/nio/cs/TestISO2022JP.java
--- pass sun/nio/cs/TestISO2022JPEncoder.java
--- pass sun/nio/cs/TestISO2022JPSubBytes.java
--- pass sun/nio/cs/TestIllegalISO2022Esc.java
--- pass sun/nio/cs/TestIllegalSJIS.java
--- pass sun/nio/cs/TestJIS0208Decoder.java
--- pass sun/nio/cs/TestJIS0212Decoder.java
--- pass sun/nio/cs/TestMS5022X.java
--- pass sun/nio/cs/TestMiscEUC_JP.java
--- fail sun/nio/cs/TestSJIS0213.java
--- pass sun/nio/cs/TestTrailingEscapesISO2022JP.java
--- pass sun/nio/cs/TestUTF8BOM.java
--- pass sun/nio/cs/TestUTF_16.java
--- pass sun/nio/cs/TestUni2HKSCS.java
--- pass sun/nio/cs/TestX11JIS0201.java
--- pass sun/nio/cs/UkrainianIsNotRussian.java
--- pass sun/nio/cs/ZeroedByteArrayEUCTWTest.java
pass ---
sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java
pass --- sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java
pass ---
sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java
pass ---
sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java
pass ---
sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java
error pass
sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java
--- fail
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
--- pass
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java
--- pass
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
--- pass
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
--- fail
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
--- fail
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
--- fail
sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
--- pass sun/security/util/Oid/BerOid.java
132 differences
-Joe
More information about the jdk6-dev
mailing list