8012728: Normalize @ignore comments on langtools tests

Fri, 03 May 2013 09:56:56 -0700

author
jjg
date
Fri, 03 May 2013 09:56:56 -0700
changeset 1721
abd153854f16
parent 1717
8e27e84de2e9
child 1722
38c4bade0ec1

8012728: Normalize @ignore comments on langtools tests
Reviewed-by: vromero, mcimadamore

test/com/sun/javadoc/_template/Template.java file | annotate | diff | comparison | revisions
test/com/sun/javadoc/_template/TemplateComplete.java file | annotate | diff | comparison | revisions
test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java file | annotate | diff | comparison | revisions
test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java file | annotate | diff | comparison | revisions
test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java file | annotate | diff | comparison | revisions
test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java file | annotate | diff | comparison | revisions
test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java file | annotate | diff | comparison | revisions
test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java file | annotate | diff | comparison | revisions
test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java file | annotate | diff | comparison | revisions
test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java file | annotate | diff | comparison | revisions
test/tools/javac/generics/7034511/T7034511a.java file | annotate | diff | comparison | revisions
test/tools/javac/generics/7034511/T7034511b.java file | annotate | diff | comparison | revisions
test/tools/javac/generics/OverrideBridge.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType36.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType53.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType54.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType58.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType59.java file | annotate | diff | comparison | revisions
test/tools/javac/lambda/TargetType62.java file | annotate | diff | comparison | revisions
test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java file | annotate | diff | comparison | revisions
test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java file | annotate | diff | comparison | revisions
test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java file | annotate | diff | comparison | revisions
test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java file | annotate | diff | comparison | revisions
test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java file | annotate | diff | comparison | revisions
test/tools/javap/output/RepeatingTypeAnnotations.java file | annotate | diff | comparison | revisions
test/tools/javap/output/Tester.java file | annotate | diff | comparison | revisions
     1.1 --- a/test/com/sun/javadoc/_template/Template.java	Wed May 01 08:46:04 2013 -0700
     1.2 +++ b/test/com/sun/javadoc/_template/Template.java	Fri May 03 09:56:56 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -22,15 +22,13 @@
    1.11   */
    1.12  
    1.13  /*
    1.14 - * test
    1.15 - * @bug      0000000
    1.16 - * @summary  <DESC>
    1.17 - * @author   jamieh
    1.18 - * @library  ../lib/
    1.19 - * @ignore   This is a template for regression tests.
    1.20 - * @build    JavadocTester
    1.21 - * @build    <CLASS NAME>
    1.22 - * @run main <CLASS NAME>
    1.23 + * @ test
    1.24 + * @ bug      <BUG-ID>
    1.25 + * @ summary  <BUG-SYNOPSIS>
    1.26 + * @ author   <AUTHOR> or delete
    1.27 + * @ library  ../lib/
    1.28 + * @ build    JavadocTester <CLASS NAME>
    1.29 + * @ run main <CLASS NAME>
    1.30   */
    1.31  
    1.32  public class Template extends JavadocTester {
     2.1 --- a/test/com/sun/javadoc/_template/TemplateComplete.java	Wed May 01 08:46:04 2013 -0700
     2.2 +++ b/test/com/sun/javadoc/_template/TemplateComplete.java	Fri May 03 09:56:56 2013 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -22,15 +22,13 @@
    2.11   */
    2.12  
    2.13  /*
    2.14 - * test
    2.15 - * @bug      0000000
    2.16 - * @summary  <DESC>
    2.17 - * @author   jamieh
    2.18 - * @library  ../lib/
    2.19 - * @ignore   This is a template for regression tests.
    2.20 - * @build    JavadocTester
    2.21 - * @build    <CLASS NAME>
    2.22 - * @run main <CLASS NAME>
    2.23 + * @ test
    2.24 + * @ bug      <BUG-ID>
    2.25 + * @ summary  <BUG-SYNOPSIS>
    2.26 + * @ author   <AUTHOR> or delete
    2.27 + * @ library  ../lib/
    2.28 + * @ build    JavadocTester <CLASS NAME>
    2.29 + * @ run main <CLASS NAME>
    2.30   */
    2.31  
    2.32  public class TemplateComplete extends JavadocTester {
     3.1 --- a/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Wed May 01 08:46:04 2013 -0700
     3.2 +++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Fri May 03 09:56:56 2013 -0700
     3.3 @@ -45,7 +45,7 @@
     3.4      private static final String[][] NEGATED_TEST = NO_TEST;
     3.5      private static final String[][] TEST = {
     3.6          // Test for type annotations on Class Extends (ClassExtends.java).
     3.7 -        /* @ignore 8012173
     3.8 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
     3.9          {BUG_ID + FS + "typeannos" + FS + "MyClass.html",
    3.10              "extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " +
    3.11              "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedClass.html\" " +
    3.12 @@ -54,7 +54,7 @@
    3.13              "@ClassExtB</a> java.lang.String&gt;"
    3.14          },
    3.15          */
    3.16 -        /* @ignore 8012173
    3.17 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.18          {BUG_ID + FS + "typeannos" + FS + "MyClass.html",
    3.19              "implements <a href=\"../typeannos/ClassExtB.html\" title=\"" +
    3.20              "annotation in typeannos\">@ClassExtB</a> java.lang.CharSequence, " +
    3.21 @@ -65,7 +65,7 @@
    3.22              "typeannos\">@ClassExtB</a> java.lang.String&gt;</pre>"
    3.23          },
    3.24          */
    3.25 -        /* @ignore 8012173
    3.26 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.27          {BUG_ID + FS + "typeannos" + FS + "MyInterface.html",
    3.28              "extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " +
    3.29              "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/" +
    3.30 @@ -83,7 +83,7 @@
    3.31              "href=\"../typeannos/ClassParamA.html\" title=\"annotation in " +
    3.32              "typeannos\">@ClassParamA</a> java.lang.String&gt;</span>"
    3.33          },
    3.34 -        /* @ignore 8012173
    3.35 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.36          {BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html",
    3.37              "<pre> class <span class=\"strong\">ExtendsGeneric&lt;K extends " +
    3.38              "<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in " +
    3.39 @@ -119,7 +119,7 @@
    3.40          },
    3.41  
    3.42          // Test for type annotations on fields (Fields.java).
    3.43 -        /* @ignore 8012173
    3.44 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.45          {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html",
    3.46              "<pre><a href=\"../typeannos/Parameterized.html\" title=\"class in " +
    3.47              "typeannos\">Parameterized</a>&lt;<a href=\"../typeannos/FldA.html\" " +
    3.48 @@ -147,7 +147,7 @@
    3.49              "typeannos\">@FldC</a> <a href=\"../typeannos/FldB.html\" title=\"" +
    3.50              "annotation in typeannos\">@FldB</a> [] array2Deep</pre>"
    3.51          },
    3.52 -        /* @ignore 8012173
    3.53 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.54          {BUG_ID + FS + "typeannos" + FS + "ModifiedScoped.html",
    3.55              "<pre>public final&nbsp;<a href=\"../typeannos/Parameterized.html\" " +
    3.56              "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"../" +
    3.57 @@ -184,7 +184,7 @@
    3.58              "<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in " +
    3.59              "typeannos\">@MRtnA</a> java.lang.String[][]&nbsp;array2()</pre>"
    3.60          },
    3.61 -        /* @ignore 8012173
    3.62 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.63          {BUG_ID + FS + "typeannos" + FS + "MtdModifiedScoped.html",
    3.64              "<pre>public final&nbsp;<a href=\"../typeannos/MtdParameterized.html\" " +
    3.65              "title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"../" +
    3.66 @@ -205,7 +205,7 @@
    3.67              "annotation in typeannos\">@MTyParamA</a> java.lang.String&gt;" +
    3.68              "&nbsp;void&nbsp;methodExtends()</pre>"
    3.69          },
    3.70 -        /* @ignore 8012173
    3.71 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.72          {BUG_ID + FS + "typeannos" + FS + "UnscopedUnmodified.html",
    3.73              "<pre>&lt;K extends <a href=\"../typeannos/MTyParamA.html\" title=\"" +
    3.74              "annotation in typeannos\">@MTyParamA</a> <a href=\"../typeannos/" +
    3.75 @@ -220,7 +220,7 @@
    3.76              "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " +
    3.77              "java.lang.String&gt;&nbsp;void&nbsp;methodExtends()</pre>"
    3.78          },
    3.79 -        /* @ignore 8012173
    3.80 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.81          {BUG_ID + FS + "typeannos" + FS + "PublicModifiedMethods.html",
    3.82              "<pre>public final&nbsp;&lt;K extends <a href=\"../typeannos/" +
    3.83              "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " +
    3.84 @@ -240,7 +240,7 @@
    3.85              "ParaParameterized</a>&lt;java.lang.String,java.lang.String&gt;" +
    3.86              "&nbsp;a)</pre>"
    3.87          },
    3.88 -        /* @ignore 8012173
    3.89 +        /* @ignore 8012173: javadoc does not receive all type annotations information from javac
    3.90          {BUG_ID + FS + "typeannos" + FS + "Parameters.html",
    3.91              "<pre>void&nbsp;nestedParaParameterized(<a href=\"../typeannos/" +
    3.92              "ParaParameterized.html\" title=\"class in typeannos\">" +
     4.1 --- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Wed May 01 08:46:04 2013 -0700
     4.2 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Fri May 03 09:56:56 2013 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -24,7 +24,6 @@
    4.11  /*
    4.12   * @test
    4.13   * @bug 8006735
    4.14 - * @ignore
    4.15   * @summary  Smoke test for ensuring that annotations are emited to javadoc
    4.16   *
    4.17   * @author   Mahmood Ali <mali>
    4.18 @@ -37,7 +36,7 @@
    4.19  public class TestSmoke extends JavadocTester {
    4.20  
    4.21      //Test information.
    4.22 -    private static final String BUG_ID = "NOT_SPECIFIED_YET";
    4.23 +    private static final String BUG_ID = "8006735";
    4.24  
    4.25      //Javadoc arguments.
    4.26      private static final String[] ARGS = new String[] {
    4.27 @@ -47,19 +46,37 @@
    4.28      //Input for string search tests.
    4.29      private static final String[][] TEST = {
    4.30          {BUG_ID + FS + "pkg" + FS + "T0x1C.html", "@DA"},
    4.31 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.32          {BUG_ID + FS + "pkg" + FS + "T0x1D.html", "@DA"},
    4.33 +        */
    4.34 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.35          {BUG_ID + FS + "pkg" + FS + "T0x0D.html", "@DA"},
    4.36 +        */
    4.37          {BUG_ID + FS + "pkg" + FS + "T0x06.html", "@DA"},
    4.38 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.39          {BUG_ID + FS + "pkg" + FS + "T0x0B.html", "@DA"},
    4.40 +        */
    4.41 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.42          {BUG_ID + FS + "pkg" + FS + "T0x0F.html", "@DA"},
    4.43 +        */
    4.44 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.45          {BUG_ID + FS + "pkg" + FS + "T0x20.html", "@DA"},
    4.46 +        */
    4.47 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.48          {BUG_ID + FS + "pkg" + FS + "T0x22.html", "@DA"},
    4.49 +        */
    4.50          {BUG_ID + FS + "pkg" + FS + "T0x10.html", "@DA"},
    4.51          {BUG_ID + FS + "pkg" + FS + "T0x10A.html", "@DA"},
    4.52          {BUG_ID + FS + "pkg" + FS + "T0x12.html", "@DA"},
    4.53 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.54          {BUG_ID + FS + "pkg" + FS + "T0x11.html", "@DA"},
    4.55 +        */
    4.56 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.57          {BUG_ID + FS + "pkg" + FS + "T0x13.html", "@DA"},
    4.58 +        */
    4.59 +        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
    4.60          {BUG_ID + FS + "pkg" + FS + "T0x15.html", "@DA"},
    4.61 +        */
    4.62          {BUG_ID + FS + "pkg" + FS + "T0x14.html", "@DA"},
    4.63          {BUG_ID + FS + "pkg" + FS + "T0x16.html", "@DA"}
    4.64      };
     5.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java	Wed May 01 08:46:04 2013 -0700
     5.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java	Fri May 03 09:56:56 2013 -0700
     5.3 @@ -24,7 +24,7 @@
     5.4  /*
     5.5   * @test
     5.6   * @bug 8005085 8005877 8004829 8005681 8006734 8006775
     5.7 - * @ignore
     5.8 + * @ignore 8013409: test failures for type annotations
     5.9   * @summary Combinations of Target ElementTypes on (repeated)type annotations.
    5.10   */
    5.11  
     6.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java	Wed May 01 08:46:04 2013 -0700
     6.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java	Fri May 03 09:56:56 2013 -0700
     6.3 @@ -24,7 +24,7 @@
     6.4  /*
     6.5   * @test
     6.6   * @bug 8005085 8005877 8004829 8005681 8006734 8006775
     6.7 - * @ignore
     6.8 + * @ignore 8013409: test failures for type annotations
     6.9   * @summary Combinations of Target ElementTypes on (repeated)type annotations.
    6.10   */
    6.11  
     7.1 --- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java	Wed May 01 08:46:04 2013 -0700
     7.2 +++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java	Fri May 03 09:56:56 2013 -0700
     7.3 @@ -1,7 +1,7 @@
     7.4  /*
     7.5   * @test /nodynamiccopyright/
     7.6   * @bug 8006733 8006775
     7.7 - * @ignore
     7.8 + * @ignore 8013409: test failures for type annotations
     7.9   * @summary A static outer class cannot be annotated.
    7.10   * @author Werner Dietl
    7.11   * @compile/fail/ref=CantAnnotateStaticClass.out -XDrawDiagnostics CantAnnotateStaticClass.java
     8.1 --- a/test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java	Wed May 01 08:46:04 2013 -0700
     8.2 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java	Fri May 03 09:56:56 2013 -0700
     8.3 @@ -25,7 +25,7 @@
     8.4  
     8.5  /*
     8.6   * @test
     8.7 - * @ignore // syntax not sure yet.
     8.8 + * @ignore 8013408: Need specification for type exceptions on multicatch
     8.9   * @bug 8006775
    8.10   * @summary new type annotation location: multicatch
    8.11   * @author Werner Dietl
     9.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java	Wed May 01 08:46:04 2013 -0700
     9.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java	Fri May 03 09:56:56 2013 -0700
     9.3 @@ -26,7 +26,7 @@
     9.4  /*
     9.5   * @test
     9.6   * @bug 8006732 8006775
     9.7 - * @ignore
     9.8 + * @ignore 8013408: Need specification for type exceptions on multicatch
     9.9   * @summary Test population of reference info for multicatch exception parameters
    9.10   * @author Werner Dietl
    9.11   * @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java
    10.1 --- a/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java	Wed May 01 08:46:04 2013 -0700
    10.2 +++ b/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java	Fri May 03 09:56:56 2013 -0700
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it
   10.10 @@ -25,7 +25,7 @@
   10.11  
   10.12  /**
   10.13   * @test
   10.14 - * @ignore 8004360
   10.15 + * @ignore 8007517: DefaultMethodRegressionTests.java fail in TL
   10.16   * @bug 8003639
   10.17   * @summary convert lambda testng tests to jtreg and add them
   10.18   * @run testng DefaultMethodRegressionTests
    11.1 --- a/test/tools/javac/generics/7034511/T7034511a.java	Wed May 01 08:46:04 2013 -0700
    11.2 +++ b/test/tools/javac/generics/7034511/T7034511a.java	Fri May 03 09:56:56 2013 -0700
    11.3 @@ -1,11 +1,13 @@
    11.4  /*
    11.5   * @test /nodynamiccopyright/
    11.6 - * @ignore backing out 7034511, see 7040883
    11.7 + * @ignore 7041019 Bogus type-variable substitution with array types with dependencies on accessibility check
    11.8   * @bug     7034511 7040883
    11.9   * @summary Loophole in typesafety
   11.10   * @compile/fail/ref=T7034511a.out -XDrawDiagnostics T7034511a.java
   11.11   */
   11.12  
   11.13 +// backing out 7034511, see 7040883
   11.14 +
   11.15  class T7034511a {
   11.16  
   11.17      interface A<T> {
    12.1 --- a/test/tools/javac/generics/7034511/T7034511b.java	Wed May 01 08:46:04 2013 -0700
    12.2 +++ b/test/tools/javac/generics/7034511/T7034511b.java	Fri May 03 09:56:56 2013 -0700
    12.3 @@ -1,11 +1,13 @@
    12.4  /*
    12.5   * @test /nodynamiccopyright/
    12.6 - * @ignore backing out 7034511, see 7040883
    12.7 + * @ignore 7041019 Bogus type-variable substitution with array types with dependencies on accessibility check
    12.8   * @bug     7034511 7040883
    12.9   * @summary Loophole in typesafety
   12.10   * @compile/fail/ref=T7034511b.out -XDrawDiagnostics T7034511b.java
   12.11   */
   12.12  
   12.13 +// backing out 7034511, see 7040883
   12.14 +
   12.15  class T7034511b {
   12.16      static class MyList<E> {
   12.17          E toArray(E[] e) { return null; }
    13.1 --- a/test/tools/javac/generics/OverrideBridge.java	Wed May 01 08:46:04 2013 -0700
    13.2 +++ b/test/tools/javac/generics/OverrideBridge.java	Fri May 03 09:56:56 2013 -0700
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -24,11 +24,13 @@
   13.11  /*
   13.12   * @test
   13.13   * @bug 6337171 6996415
   13.14 - * @ignore fix has been disabled as a consequence of 6996415
   13.15 + * @ignore 6996758: Investigate better override bridges strategy
   13.16   * @summary  javac should create bridge methods when type variable bounds restricted
   13.17   * @run main OverrideBridge
   13.18   */
   13.19  
   13.20 +// fix, and test, has been disabled as a consequence of 6996415
   13.21 +
   13.22  import java.io.*;
   13.23  import java.net.URI;
   13.24  import java.util.ArrayList;
    14.1 --- a/test/tools/javac/lambda/TargetType36.java	Wed May 01 08:46:04 2013 -0700
    14.2 +++ b/test/tools/javac/lambda/TargetType36.java	Fri May 03 09:56:56 2013 -0700
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -23,7 +23,7 @@
   14.11  
   14.12  /*
   14.13   * @test
   14.14 - * @ignore
   14.15 + * @ignore 8013404: Test awaits spec clarification
   14.16   * @bug 8003280
   14.17   * @summary Add lambda tests
   14.18   *  check that target type of cast is propagated to conditional subexpressions
    15.1 --- a/test/tools/javac/lambda/TargetType53.java	Wed May 01 08:46:04 2013 -0700
    15.2 +++ b/test/tools/javac/lambda/TargetType53.java	Fri May 03 09:56:56 2013 -0700
    15.3 @@ -26,7 +26,7 @@
    15.4   * @bug 8007464
    15.5   * @summary Add graph inference support
    15.6   *          smoke test for graph inference
    15.7 - * @ignore  awaits stream API: 800NNNN
    15.8 + * @ignore  8008682: Core stream API classes
    15.9   * @compile TargetType53.java
   15.10   */
   15.11  import java.util.*;
    16.1 --- a/test/tools/javac/lambda/TargetType54.java	Wed May 01 08:46:04 2013 -0700
    16.2 +++ b/test/tools/javac/lambda/TargetType54.java	Fri May 03 09:56:56 2013 -0700
    16.3 @@ -26,7 +26,7 @@
    16.4   * @bug 8007464
    16.5   * @summary Add graph inference support
    16.6   *          smoke test for graph inference
    16.7 - * @ignore  awaits stream API: 800NNNN
    16.8 + * @ignore  8008682: Core stream API classes
    16.9   * @compile TargetType54.java
   16.10   */
   16.11  import java.util.stream.*;
    17.1 --- a/test/tools/javac/lambda/TargetType58.java	Wed May 01 08:46:04 2013 -0700
    17.2 +++ b/test/tools/javac/lambda/TargetType58.java	Fri May 03 09:56:56 2013 -0700
    17.3 @@ -26,7 +26,7 @@
    17.4   * @bug 8007464
    17.5   * @summary Add graph inference support
    17.6   *          more smoke tests for graph inference
    17.7 - * @ignore  awaits stream API: 800NNNN
    17.8 + * @ignore  8008682: Core stream API classes
    17.9   * @compile TargetType58.java
   17.10   */
   17.11  import java.util.*;
    18.1 --- a/test/tools/javac/lambda/TargetType59.java	Wed May 01 08:46:04 2013 -0700
    18.2 +++ b/test/tools/javac/lambda/TargetType59.java	Fri May 03 09:56:56 2013 -0700
    18.3 @@ -26,7 +26,7 @@
    18.4   * @bug 8007464
    18.5   * @summary Add graph inference support
    18.6   *          more smoke tests for graph inference
    18.7 - * @ignore  awaits stream API: 800NNNN
    18.8 + * @ignore  8008682: Core stream API classes
    18.9   * @compile TargetType59.java
   18.10   */
   18.11  import java.util.*;
    19.1 --- a/test/tools/javac/lambda/TargetType62.java	Wed May 01 08:46:04 2013 -0700
    19.2 +++ b/test/tools/javac/lambda/TargetType62.java	Fri May 03 09:56:56 2013 -0700
    19.3 @@ -26,7 +26,7 @@
    19.4   * @bug 8007464
    19.5   * @summary Add graph inference support
    19.6   *          check that new wildcards inference strategy doesn't run into 7190296
    19.7 - * @ignore  awaits stream API: 800NNNN
    19.8 + * @ignore  8008682: Core stream API classes
    19.9   * @compile TargetType62.java
   19.10   */
   19.11  import java.util.*;
    20.1 --- a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java	Wed May 01 08:46:04 2013 -0700
    20.2 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java	Fri May 03 09:56:56 2013 -0700
    20.3 @@ -22,13 +22,13 @@
    20.4   */
    20.5  
    20.6  /*
    20.7 - * @ignore
    20.8   * @test
    20.9   * @bug     8004822
   20.10   * @author  mnunez
   20.11   * @summary Language model api test basics for repeating annotations
   20.12   * @library /tools/javac/lib
   20.13   * @library supportingAnnotations
   20.14 + * @ignore  8013407: test failures for repeating annotations
   20.15   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   20.16   * @compile -processor ElementRepAnnoTester -proc:only
   20.17   * MixRepeatableAndOfficialContainerInheritedA1Test.java
    21.1 --- a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java	Wed May 01 08:46:04 2013 -0700
    21.2 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java	Fri May 03 09:56:56 2013 -0700
    21.3 @@ -22,13 +22,13 @@
    21.4   */
    21.5  
    21.6  /*
    21.7 - * @ignore
    21.8   * @test
    21.9   * @bug     8004822
   21.10   * @author  mnunez
   21.11   * @summary Language model api test basics for repeating annotations
   21.12   * @library /tools/javac/lib
   21.13   * @library supportingAnnotations
   21.14 + * @ignore  8013407: test failures for repeating annotations
   21.15   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   21.16   * @compile -processor ElementRepAnnoTester -proc:only
   21.17   * MixRepeatableAndOfficialContainerInheritedB1Test.java
    22.1 --- a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java	Wed May 01 08:46:04 2013 -0700
    22.2 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java	Fri May 03 09:56:56 2013 -0700
    22.3 @@ -22,13 +22,13 @@
    22.4   */
    22.5  
    22.6  /*
    22.7 - * @ignore
    22.8   * @test
    22.9   * @bug     8004822
   22.10   * @author  mnunez
   22.11   * @summary Language model api test basics for repeating annotations
   22.12   * @library /tools/javac/lib
   22.13   * @library supportingAnnotations
   22.14 + * @ignore  8013407: test failures for repeating annotations
   22.15   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   22.16   * @compile -processor ElementRepAnnoTester -proc:only
   22.17   * MixRepeatableAndOfficialContainerInheritedB2Test.java
    23.1 --- a/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java	Wed May 01 08:46:04 2013 -0700
    23.2 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java	Fri May 03 09:56:56 2013 -0700
    23.3 @@ -22,13 +22,13 @@
    23.4   */
    23.5  
    23.6  /*
    23.7 - * @ignore
    23.8   * @test
    23.9   * @bug     8004822
   23.10   * @author  mnunez
   23.11   * @summary Language model api test basics for repeating annotations
   23.12   * @library /tools/javac/lib
   23.13   * @library supportingAnnotations
   23.14 + * @ignore  8013407: test failures for repeating annotations
   23.15   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   23.16   * @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideATest.java
   23.17   */
    24.1 --- a/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java	Wed May 01 08:46:04 2013 -0700
    24.2 +++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java	Fri May 03 09:56:56 2013 -0700
    24.3 @@ -22,13 +22,13 @@
    24.4   */
    24.5  
    24.6  /*
    24.7 - * @ignore
    24.8   * @test
    24.9   * @bug     8004822
   24.10   * @author  mnunez
   24.11   * @summary Language model api test basics for repeating annotations
   24.12   * @library /tools/javac/lib
   24.13   * @library supportingAnnotations
   24.14 + * @ignore  8013407: test failures for repeating annotations
   24.15   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   24.16   * @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideBTest.java
   24.17   */
    25.1 --- a/test/tools/javap/output/RepeatingTypeAnnotations.java	Wed May 01 08:46:04 2013 -0700
    25.2 +++ b/test/tools/javap/output/RepeatingTypeAnnotations.java	Fri May 03 09:56:56 2013 -0700
    25.3 @@ -121,7 +121,7 @@
    25.4       */
    25.5  
    25.6      @TestCase
    25.7 -    @ignore // 8008082:missing type annotation for cast
    25.8 +    @ignore // 8008082: missing type annotation for cast
    25.9      public static class TC1 extends RepeatingTypeAnnotations {
   25.10          public TC1() {
   25.11              setSrc("    static String so = \"hello world\";",
   25.12 @@ -176,7 +176,7 @@
   25.13      }
   25.14  
   25.15      @TestCase
   25.16 -    @ignore // 8008082:missing type annotation for cast
   25.17 +    @ignore // 8008082: missing type annotation for cast
   25.18      public static class TC5 extends RepeatingTypeAnnotations {
   25.19          public TC5() {
   25.20              setSrc("    static String so = \"hello world\";",
   25.21 @@ -231,7 +231,7 @@
   25.22      }
   25.23  
   25.24      @TestCase
   25.25 -    @ignore // 8008082:missing type annotation for cast
   25.26 +    @ignore // 8008082: missing type annotation for cast
   25.27      public static class TC9 extends RepeatingTypeAnnotations {
   25.28          public TC9() {
   25.29              setSrc("    public Test(@A @A @A Object o, @A int i, long l) {",
   25.30 @@ -305,7 +305,7 @@
   25.31      }
   25.32  
   25.33      @TestCase
   25.34 -    @ignore // 8008082:missing type annotation for cast
   25.35 +    @ignore // 8008082: missing type annotation for cast
   25.36      public static class TC13 extends RepeatingTypeAnnotations {
   25.37          public TC13() {
   25.38              setSrc("    public @A @A @A String foo(@A @A @A Object o, @A int i, long l) {",
    26.1 --- a/test/tools/javap/output/Tester.java	Wed May 01 08:46:04 2013 -0700
    26.2 +++ b/test/tools/javap/output/Tester.java	Fri May 03 09:56:56 2013 -0700
    26.3 @@ -128,8 +128,8 @@
    26.4  
    26.5      /**
    26.6       * Individual test-cases failing due to product bugs, may temporarily
    26.7 -     * be excluded by marking them like  this:
    26.8 -     * @ignore // 1234567:bug synopsis
    26.9 +     * be excluded by marking them like this, (where "at-" is replaced by "@")
   26.10 +     * at-ignore // 1234567: bug synopsis
   26.11       */
   26.12      @Retention(RetentionPolicy.RUNTIME)
   26.13      @interface ignore { }

mercurial