From efb118265c04197820095a12c64fb4c2c4c5ca2c Mon Sep 17 00:00:00 2001
From: kizune <unknown>
Date: Mon, 7 Apr 2014 11:38:59 +0200
Subject: [PATCH] 8031425: Two langtools/javac tests fail by timeout on Windows
 Reviewed-by: vromero, jjg

---
 .../static/hiding/InterfaceMethodHidingTest.java              | 3 ++-
 .../tools/javac/lambda/FunctionalInterfaceConversionTest.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java b/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
index ba69bd61..52f912b6 100644
--- a/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
+++ b/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8005166
  * @summary Add support for static interface methods
  *          Smoke test for static interface method hiding
+ * @run main/timeout=600 InterfaceMethodHidingTest
  */
 
 import com.sun.source.util.JavacTask;
diff --git a/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java b/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java
index 06db2156..8e50868f 100644
--- a/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java
+++ b/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
  * @author  Maurizio Cimadamore
  * @library ../lib
  * @build JavacTestingAbstractThreadedTest
- * @run main/othervm FunctionalInterfaceConversionTest
+ * @run main/timeout=600/othervm FunctionalInterfaceConversionTest
  */
 
 // use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
-- 
GitLab