From aa58ae7951e98d58e051c8da48ea54a4b289c93d Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Tue, 19 Nov 2013 15:05:30 -0800
Subject: [PATCH] 8028638:
 java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java
 fails

Reviewed-by: lancea
---
 jdk/test/java/rmi/testlibrary/RMID.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jdk/test/java/rmi/testlibrary/RMID.java b/jdk/test/java/rmi/testlibrary/RMID.java
index f528b2058fe..7688a1b6456 100644
--- a/jdk/test/java/rmi/testlibrary/RMID.java
+++ b/jdk/test/java/rmi/testlibrary/RMID.java
@@ -74,6 +74,10 @@ public class RMID extends JavaVM {
         // +
         // " -Djava.security.debug=all ";
 
+        // Set execTimeout to 60 sec (default is 30 sec)
+        // to avoid spurious timeouts on slow machines.
+        options += " -Dsun.rmi.activation.execTimeout=60000";
+
         return options;
     }