Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/Makefile	Wed Jan 23 15:08:03 2013 +0000
     1.2 +++ b/test/Makefile	Wed Jan 23 20:57:40 2013 +0000
     1.3 @@ -272,6 +272,7 @@
     1.4  	@mkdir -p $(JTREG_OUTPUT_DIR)
     1.5  	JT_JAVA=$(JT_JAVA) $(JTREG) \
     1.6  	  -J-Xmx512m \
     1.7 +	  -vmoption:-Xmx768m \
     1.8  	  -a -ignore:quiet -v:fail,error,nopass \
     1.9            -r:$(JTREG_OUTPUT_DIR)/JTreport \
    1.10            -w:$(JTREG_OUTPUT_DIR)/JTwork \

     2.1 --- a/test/tools/javac/Diagnostics/6769027/T6769027.java	Wed Jan 23 15:08:03 2013 +0000
     2.2 +++ b/test/tools/javac/Diagnostics/6769027/T6769027.java	Wed Jan 23 20:57:40 2013 +0000
     2.3 @@ -23,14 +23,18 @@
     2.4  
     2.5  /**
     2.6   * @test
     2.7 - * @bug     6769027
     2.8 + * @bug     6769027 8006694
     2.9   * @summary Source line should be displayed immediately after the first diagnostic line
    2.10 + *  temporarily workaround combo tests are causing time out in several platforms
    2.11   * @author  Maurizio Cimadamore
    2.12   * @library ../../lib
    2.13   * @build JavacTestingAbstractThreadedTest
    2.14   * @run main/othervm T6769027
    2.15   */
    2.16  
    2.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    2.18 +// see JDK-8006746
    2.19 +
    2.20  import java.net.URI;
    2.21  import java.util.regex.Matcher;
    2.22  import javax.tools.*;
    2.23 @@ -488,7 +492,7 @@
    2.24          }
    2.25  
    2.26          if (!msg.equals(errorLine)) {
    2.27 -            printInfo(msg, errorLine);
    2.28 +//            printInfo(msg, errorLine);
    2.29              errCount.incrementAndGet();
    2.30          }
    2.31      }

     3.1 --- a/test/tools/javac/T7093325.java	Wed Jan 23 15:08:03 2013 +0000
     3.2 +++ b/test/tools/javac/T7093325.java	Wed Jan 23 20:57:40 2013 +0000
     3.3 @@ -23,13 +23,17 @@
     3.4  
     3.5  /*
     3.6   * @test
     3.7 - * @bug 7093325
     3.8 + * @bug 7093325 8006694
     3.9   * @summary Redundant entry in bytecode exception table
    3.10 + *  temporarily workaround combo tests are causing time out in several platforms
    3.11   * @library lib
    3.12   * @build JavacTestingAbstractThreadedTest
    3.13 - * @run main T7093325
    3.14 + * @run main/othervm T7093325
    3.15   */
    3.16  
    3.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    3.18 +// see JDK-8006746
    3.19 +
    3.20  import java.io.File;
    3.21  import java.net.URI;
    3.22  import java.util.Arrays;
    3.23 @@ -171,8 +175,6 @@
    3.24              gapsCount++;
    3.25          }
    3.26  
    3.27 -        //System.out.printf("gaps %d \n %s \n", gapsCount, source.toString());
    3.28 -
    3.29          File compiledTest = new File(String.format("Test%s.class", id));
    3.30          try {
    3.31              ClassFile cf = ClassFile.read(compiledTest);

     4.1 --- a/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java	Wed Jan 23 15:08:03 2013 +0000
     4.2 +++ b/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java	Wed Jan 23 20:57:40 2013 +0000
     4.3 @@ -23,13 +23,17 @@
     4.4  
     4.5  /*
     4.6   * @test
     4.7 - * @bug 8002099
     4.8 + * @bug 8002099 8006694
     4.9   * @summary Add support for intersection types in cast expression
    4.10 + *  temporarily workaround combo tests are causing time out in several platforms
    4.11   * @library ../../lib
    4.12   * @build JavacTestingAbstractThreadedTest
    4.13 - * @run main/timeout=360 IntersectionTypeCastTest
    4.14 + * @run main/othervm/timeout=360 IntersectionTypeCastTest
    4.15   */
    4.16  
    4.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    4.18 +// see JDK-8006746
    4.19 +
    4.20  import java.net.URI;
    4.21  import java.util.Arrays;
    4.22  import javax.tools.Diagnostic;

     5.1 --- a/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java	Wed Jan 23 15:08:03 2013 +0000
     5.2 +++ b/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java	Wed Jan 23 20:57:40 2013 +0000
     5.3 @@ -23,17 +23,21 @@
     5.4  
     5.5  /*
     5.6   * @test
     5.7 + * @bug 8006694
     5.8   * @summary Automatic test for checking correctness of default super/this resolution
     5.9 + *  temporarily workaround combo tests are causing time out in several platforms
    5.10   * @library ../../lib
    5.11   * @build JavacTestingAbstractThreadedTest
    5.12 - * @run main TestDefaultSuperCall
    5.13 + * @run main/othervm TestDefaultSuperCall
    5.14   */
    5.15  
    5.16 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    5.17 +// see JDK-8006746
    5.18 +
    5.19  import java.net.URI;
    5.20  import java.util.Arrays;
    5.21  import java.util.ArrayList;
    5.22  import java.util.List;
    5.23 -import java.util.Locale;
    5.24  import javax.tools.Diagnostic;
    5.25  import javax.tools.JavaFileObject;
    5.26  import javax.tools.SimpleJavaFileObject;
    5.27 @@ -212,7 +216,6 @@
    5.28          List<String> elementsWithMethod;
    5.29  
    5.30          Shape(ElementKind... elements) {
    5.31 -            errWriter.println("elements = " + Arrays.toString(elements));
    5.32              enclosingElements = new ArrayList<>();
    5.33              enclosingNames = new ArrayList<>();
    5.34              elementsWithMethod = new ArrayList<>();
    5.35 @@ -406,7 +409,6 @@
    5.36  
    5.37          public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
    5.38              if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
    5.39 -                errWriter.println(diagnostic.getMessage(Locale.getDefault()));
    5.40                  errorFound = true;
    5.41              }
    5.42          }

     6.1 --- a/test/tools/javac/failover/CheckAttributedTree.java	Wed Jan 23 15:08:03 2013 +0000
     6.2 +++ b/test/tools/javac/failover/CheckAttributedTree.java	Wed Jan 23 20:57:40 2013 +0000
     6.3 @@ -23,13 +23,17 @@
     6.4  
     6.5  /*
     6.6   * @test
     6.7 - * @bug 6970584
     6.8 + * @bug 6970584 8006694
     6.9   * @summary assorted position errors in compiler syntax trees
    6.10 + *  temporarily workaround combo tests are causing time out in several platforms
    6.11   * @library ../lib
    6.12   * @build JavacTestingAbstractThreadedTest
    6.13 - * @run main CheckAttributedTree -q -r -et ERRONEOUS .
    6.14 + * @run main/othervm CheckAttributedTree -q -r -et ERRONEOUS .
    6.15   */
    6.16  
    6.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    6.18 +// see JDK-8006746
    6.19 +
    6.20  import java.awt.BorderLayout;
    6.21  import java.awt.Color;
    6.22  import java.awt.Dimension;
    6.23 @@ -505,7 +509,7 @@
    6.24          }
    6.25  
    6.26          public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
    6.27 -            out.println(diagnostic);
    6.28 +            //out.println(diagnostic);
    6.29              switch (diagnostic.getKind()) {
    6.30                  case ERROR:
    6.31                      errors++;

     7.1 --- a/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Wed Jan 23 15:08:03 2013 +0000
     7.2 +++ b/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Wed Jan 23 20:57:40 2013 +0000
     7.3 @@ -23,13 +23,17 @@
     7.4  
     7.5  /*
     7.6   * @test
     7.7 - * @bug 7046778
     7.8 + * @bug 7046778 8006694
     7.9   * @summary Project Coin: problem with diamond and member inner classes
    7.10 + *  temporarily workaround combo tests are causing time out in several platforms
    7.11   * @library ../../../lib
    7.12   * @build JavacTestingAbstractThreadedTest
    7.13 - * @run main DiamondAndInnerClassTest
    7.14 + * @run main/othervm DiamondAndInnerClassTest
    7.15   */
    7.16  
    7.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    7.18 +// see JDK-8006746
    7.19 +
    7.20  import com.sun.source.util.JavacTask;
    7.21  import java.net.URI;
    7.22  import java.util.Arrays;

     8.1 --- a/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Wed Jan 23 15:08:03 2013 +0000
     8.2 +++ b/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Wed Jan 23 20:57:40 2013 +0000
     8.3 @@ -23,14 +23,18 @@
     8.4  
     8.5  /*
     8.6   * @test
     8.7 - * @bug 7062745
     8.8 + * @bug 7062745 8006694
     8.9   * @summary  Regression: difference in overload resolution when two methods
    8.10 - * are maximally specific
    8.11 + *  are maximally specific
    8.12 + *  temporarily workaround combo tests are causing time out in several platforms
    8.13   * @library ../../../lib
    8.14   * @build JavacTestingAbstractThreadedTest
    8.15 - * @run main GenericOverrideTest
    8.16 + * @run main/othervm GenericOverrideTest
    8.17   */
    8.18  
    8.19 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    8.20 +// see JDK-8006746
    8.21 +
    8.22  import java.net.URI;
    8.23  import java.util.Arrays;
    8.24  import javax.tools.Diagnostic;

     9.1 --- a/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java	Wed Jan 23 15:08:03 2013 +0000
     9.2 +++ b/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java	Wed Jan 23 20:57:40 2013 +0000
     9.3 @@ -23,15 +23,19 @@
     9.4  
     9.5  /**
     9.6   * @test
     9.7 - * @bug 8003280 8004102
     9.8 + * @bug 8003280 8004102 8006694
     9.9   * @summary Add lambda tests
    9.10   *  perform several automated checks in lambda conversion, esp. around accessibility
    9.11 + *  temporarily workaround combo tests are causing time out in several platforms
    9.12   * @author  Maurizio Cimadamore
    9.13   * @library ../lib
    9.14   * @build JavacTestingAbstractThreadedTest
    9.15 - * @run main FunctionalInterfaceConversionTest
    9.16 + * @run main/othervm FunctionalInterfaceConversionTest
    9.17   */
    9.18  
    9.19 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
    9.20 +// see JDK-8006746
    9.21 +
    9.22  import java.io.IOException;
    9.23  import java.net.URI;
    9.24  import java.util.Arrays;

    10.1 --- a/test/tools/javac/lambda/LambdaParserTest.java	Wed Jan 23 15:08:03 2013 +0000
    10.2 +++ b/test/tools/javac/lambda/LambdaParserTest.java	Wed Jan 23 20:57:40 2013 +0000
    10.3 @@ -23,14 +23,18 @@
    10.4  
    10.5  /*
    10.6   * @test
    10.7 - * @bug 7115050 8003280 8005852
    10.8 + * @bug 7115050 8003280 8005852 8006694
    10.9   * @summary Add lambda tests
   10.10   *  Add parser support for lambda expressions
   10.11 + *  temporarily workaround combo tests are causing time out in several platforms
   10.12   * @library ../lib
   10.13   * @build JavacTestingAbstractThreadedTest
   10.14 - * @run main LambdaParserTest
   10.15 + * @run main/othervm LambdaParserTest
   10.16   */
   10.17  
   10.18 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   10.19 +// see JDK-8006746
   10.20 +
   10.21  import java.net.URI;
   10.22  import java.util.Arrays;
   10.23  import javax.tools.Diagnostic;

    11.1 --- a/test/tools/javac/lambda/MethodReferenceParserTest.java	Wed Jan 23 15:08:03 2013 +0000
    11.2 +++ b/test/tools/javac/lambda/MethodReferenceParserTest.java	Wed Jan 23 20:57:40 2013 +0000
    11.3 @@ -24,14 +24,18 @@
    11.4  /*
    11.5   * @test
    11.6   * @bug 7115052
    11.7 - * @bug 8003280
    11.8 + * @bug 8003280 8006694
    11.9   * @summary Add lambda tests
   11.10   *  Add parser support for method references
   11.11 + *  temporarily workaround combo tests are causing time out in several platforms
   11.12   * @library ../lib
   11.13   * @build JavacTestingAbstractThreadedTest
   11.14 - * @run main MethodReferenceParserTest
   11.15 + * @run main/othervm MethodReferenceParserTest
   11.16   */
   11.17  
   11.18 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   11.19 +// see JDK-8006746
   11.20 +
   11.21  import java.net.URI;
   11.22  import java.util.Arrays;
   11.23  import javax.tools.Diagnostic;

    12.1 --- a/test/tools/javac/lambda/TestInvokeDynamic.java	Wed Jan 23 15:08:03 2013 +0000
    12.2 +++ b/test/tools/javac/lambda/TestInvokeDynamic.java	Wed Jan 23 20:57:40 2013 +0000
    12.3 @@ -24,15 +24,18 @@
    12.4  /*
    12.5   * @test
    12.6   * @bug 7194586
    12.7 - *
    12.8 - * @bug 8003280
    12.9 + * @bug 8003280 8006694
   12.10   * @summary Add lambda tests
   12.11   *  Add back-end support for invokedynamic
   12.12 + *  temporarily workaround combo tests are causing time out in several platforms
   12.13   * @library ../lib
   12.14   * @build JavacTestingAbstractThreadedTest
   12.15 - * @run main TestInvokeDynamic
   12.16 + * @run main/othervm TestInvokeDynamic
   12.17   */
   12.18  
   12.19 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   12.20 +// see JDK-8006746
   12.21 +
   12.22  import com.sun.source.tree.MethodInvocationTree;
   12.23  import com.sun.source.tree.MethodTree;
   12.24  import com.sun.source.util.TaskEvent;
   12.25 @@ -48,7 +51,6 @@
   12.26  import com.sun.tools.classfile.Method;
   12.27  
   12.28  import com.sun.tools.javac.api.JavacTaskImpl;
   12.29 -import com.sun.tools.javac.api.JavacTool;
   12.30  import com.sun.tools.javac.code.Symbol;
   12.31  import com.sun.tools.javac.code.Symbol.MethodSymbol;
   12.32  import com.sun.tools.javac.code.Symtab;
   12.33 @@ -67,11 +69,8 @@
   12.34  import java.util.Locale;
   12.35  
   12.36  import javax.tools.Diagnostic;
   12.37 -import javax.tools.JavaCompiler;
   12.38  import javax.tools.JavaFileObject;
   12.39  import javax.tools.SimpleJavaFileObject;
   12.40 -import javax.tools.StandardJavaFileManager;
   12.41 -import javax.tools.ToolProvider;
   12.42  
   12.43  import static com.sun.tools.javac.jvm.ClassFile.*;
   12.44  

    13.1 --- a/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Wed Jan 23 15:08:03 2013 +0000
    13.2 +++ b/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Wed Jan 23 20:57:40 2013 +0000
    13.3 @@ -23,14 +23,18 @@
    13.4  
    13.5  /*
    13.6   * @test
    13.7 - * @bug 8003280
    13.8 + * @bug 8003280 8006694
    13.9   * @summary Add lambda tests
   13.10   *  Automatic test for checking correctness of structural most specific test routine
   13.11 + *  temporarily workaround combo tests are causing time out in several platforms
   13.12   * @library ../../lib
   13.13   * @build JavacTestingAbstractThreadedTest
   13.14 - * @run main/timeout=600 StructuralMostSpecificTest
   13.15 + * @run main/othervm/timeout=600 StructuralMostSpecificTest
   13.16   */
   13.17  
   13.18 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   13.19 +// see JDK-8006746
   13.20 +
   13.21  import java.net.URI;
   13.22  import java.util.Arrays;
   13.23  import javax.tools.Diagnostic;

    14.1 --- a/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java	Wed Jan 23 15:08:03 2013 +0000
    14.2 +++ b/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java	Wed Jan 23 20:57:40 2013 +0000
    14.3 @@ -23,16 +23,20 @@
    14.4  
    14.5  /**
    14.6   * @test
    14.7 - * @bug 8003280
    14.8 + * @bug 8003280 8006694
    14.9   * @summary Add lambda tests
   14.10   *  perform automated checks in type inference in lambda expressions
   14.11   *  in different contexts
   14.12 + *  temporarily workaround combo tests are causing time out in several platforms
   14.13   * @library ../../../lib
   14.14   * @build JavacTestingAbstractThreadedTest
   14.15   * @compile  TypeInferenceComboTest.java
   14.16 - * @run main/timeout=360 TypeInferenceComboTest
   14.17 + * @run main/othervm/timeout=360 TypeInferenceComboTest
   14.18   */
   14.19  
   14.20 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   14.21 +// see JDK-8006746
   14.22 +
   14.23  import java.net.URI;
   14.24  import java.util.Arrays;
   14.25  import javax.tools.Diagnostic;
   14.26 @@ -256,16 +260,6 @@
   14.27      };
   14.28  
   14.29      public void run() {
   14.30 -        outWriter.println("kk:");
   14.31 -        StringBuilder sb = new StringBuilder("SamKind:");
   14.32 -        sb.append(samKind).append(" SamTargetType:")
   14.33 -            .append(samTargetType).append(" ParameterType:").append(parameterType)
   14.34 -            .append(" ReturnType:").append(returnType).append(" Context:")
   14.35 -            .append(context).append(" LambdaKind:").append(lambdaKind)
   14.36 -            .append(" LambdaBodyType:").append(lambdaBodyType)
   14.37 -            .append(" ParameterKind:").append(parameterKind).append(" Keyword:")
   14.38 -            .append(keyword);
   14.39 -        outWriter.println(sb);
   14.40          DiagnosticChecker dc = new DiagnosticChecker();
   14.41          JavacTask ct = (JavacTask)comp.getTask(null, fm.get(), dc,
   14.42                  null, null, Arrays.asList(samSourceFile, clientSourceFile));

    15.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java	Wed Jan 23 15:08:03 2013 +0000
    15.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java	Wed Jan 23 20:57:40 2013 +0000
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -23,6 +23,9 @@
   15.11   * questions.
   15.12   */
   15.13  
   15.14 +// this test has been disabled because of timeout issues.
   15.15 +// see JDK-8006746
   15.16 +
   15.17  package org.openjdk.tests.vm;
   15.18  
   15.19  import java.util.*;
   15.20 @@ -91,7 +94,7 @@
   15.21      private static final ConcreteMethod canonicalMethod = new ConcreteMethod(
   15.22              "String", "m", "returns " + EMPTY + ";", AccessFlag.PUBLIC);
   15.23  
   15.24 -    @Test(groups = "vm", dataProvider = "allShapes")
   15.25 +    @Test(enabled = false, groups = "vm", dataProvider = "allShapes")
   15.26      public void separateCompilationTest(Hierarchy hs) {
   15.27          ClassCase cc = hs.root;
   15.28          Type type = sourceTypeFrom(hs.root);

    16.1 --- a/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java	Wed Jan 23 15:08:03 2013 +0000
    16.2 +++ b/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java	Wed Jan 23 20:57:40 2013 +0000
    16.3 @@ -26,6 +26,7 @@
    16.4  import java.util.concurrent.ExecutorService;
    16.5  import java.util.concurrent.Executors;
    16.6  import java.util.concurrent.ThreadFactory;
    16.7 +import java.util.concurrent.TimeUnit;
    16.8  import java.util.concurrent.atomic.AtomicInteger;
    16.9  import javax.tools.JavaCompiler;
   16.10  import javax.tools.StandardJavaFileManager;
   16.11 @@ -67,9 +68,7 @@
   16.12      protected static void checkAfterExec(boolean printCheckCount)
   16.13              throws InterruptedException {
   16.14          pool.shutdown();
   16.15 -        while (!pool.isTerminated()) {
   16.16 -            Thread.sleep(10);
   16.17 -        }
   16.18 +        pool.awaitTermination(15, TimeUnit.MINUTES);
   16.19          if (errCount.get() > 0) {
   16.20              if (throwAssertionOnError) {
   16.21                  closePrinters();

    17.1 --- a/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java	Wed Jan 23 15:08:03 2013 +0000
    17.2 +++ b/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java	Wed Jan 23 20:57:40 2013 +0000
    17.3 @@ -23,13 +23,17 @@
    17.4  
    17.5  /*
    17.6   * @test
    17.7 - * @bug 7030606
    17.8 + * @bug 7030606 8006694
    17.9   * @summary Project-coin: multi-catch types should be pairwise disjoint
   17.10 + *  temporarily workaround combo tests are causing time out in several platforms
   17.11   * @library ../../lib
   17.12   * @build JavacTestingAbstractThreadedTest
   17.13 - * @run main DisjunctiveTypeWellFormednessTest
   17.14 + * @run main/othervm DisjunctiveTypeWellFormednessTest
   17.15   */
   17.16  
   17.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   17.18 +// see JDK-8006746
   17.19 +
   17.20  import java.net.URI;
   17.21  import java.util.Arrays;
   17.22  import javax.tools.Diagnostic;

    18.1 --- a/test/tools/javac/varargs/7042566/T7042566.java	Wed Jan 23 15:08:03 2013 +0000
    18.2 +++ b/test/tools/javac/varargs/7042566/T7042566.java	Wed Jan 23 20:57:40 2013 +0000
    18.3 @@ -23,13 +23,17 @@
    18.4  
    18.5  /*
    18.6   * @test
    18.7 - * @bug 7042566
    18.8 + * @bug 7042566 8006694
    18.9   * @summary Unambiguous varargs method calls flagged as ambiguous
   18.10 + *  temporarily workaround combo tests are causing time out in several platforms
   18.11   * @library ../../lib
   18.12   * @build JavacTestingAbstractThreadedTest
   18.13 - * @run main T7042566
   18.14 + * @run main/othervm T7042566
   18.15   */
   18.16  
   18.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   18.18 +// see JDK-8006746
   18.19 +
   18.20  import java.io.File;
   18.21  import java.net.URI;
   18.22  import java.util.Arrays;

    19.1 --- a/test/tools/javac/varargs/warning/Warn4.java	Wed Jan 23 15:08:03 2013 +0000
    19.2 +++ b/test/tools/javac/varargs/warning/Warn4.java	Wed Jan 23 20:57:40 2013 +0000
    19.3 @@ -23,14 +23,18 @@
    19.4  
    19.5  /**
    19.6   * @test
    19.7 - * @bug     6945418 6993978
    19.8 + * @bug     6945418 6993978 8006694
    19.9   * @summary Project Coin: Simplified Varargs Method Invocation
   19.10 + *  temporarily workaround combo tests are causing time out in several platforms
   19.11   * @author  mcimadamore
   19.12   * @library ../../lib
   19.13   * @build JavacTestingAbstractThreadedTest
   19.14 - * @run main Warn4
   19.15 + * @run main/othervm Warn4
   19.16   */
   19.17  
   19.18 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   19.19 +// see JDK-8006746
   19.20 +
   19.21  import java.net.URI;
   19.22  import java.util.Arrays;
   19.23  import java.util.Set;
   19.24 @@ -238,7 +242,6 @@
   19.25          for (Warning wkind : Warning.values()) {
   19.26              boolean isSuppressed = wkind.isSuppressed(trustMe, sourceLevel,
   19.27                      suppressLevelClient, suppressLevelDecl, modKind);
   19.28 -            System.out.println("SUPPRESSED = " + isSuppressed);
   19.29              badOutput |= (warnArr[wkind.ordinal()] && !isSuppressed) !=
   19.30                      diagChecker.warnings.contains(wkind);
   19.31          }

    20.1 --- a/test/tools/javac/varargs/warning/Warn5.java	Wed Jan 23 15:08:03 2013 +0000
    20.2 +++ b/test/tools/javac/varargs/warning/Warn5.java	Wed Jan 23 20:57:40 2013 +0000
    20.3 @@ -23,13 +23,18 @@
    20.4  
    20.5  /**
    20.6   * @test
    20.7 - * @bug     6993978 7097436
    20.8 + * @bug     6993978 7097436 8006694
    20.9   * @summary Project Coin: Annotation to reduce varargs warnings
   20.10 + *  temporarily workaround combo tests are causing time out in several platforms
   20.11   * @author  mcimadamore
   20.12   * @library ../../lib
   20.13   * @build JavacTestingAbstractThreadedTest
   20.14 - * @run main Warn5
   20.15 + * @run main/othervm Warn5
   20.16   */
   20.17 +
   20.18 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
   20.19 +// see JDK-8006746
   20.20 +
   20.21  import java.net.URI;
   20.22  import java.util.Arrays;
   20.23  import java.util.EnumSet;