# HG changeset patch
# User mikael
# Date 1417840200 0
# Node ID 5227de1058d52ef08b086cf87ab15d4aa2606112
# Parent  ece5ab85141ec1261d83a53f07cd237d80062a50# Parent  e19f567fcac24e06dc65092037b131bf53e9cfc0
Merge

diff -r ece5ab85141e -r 5227de1058d5 hotspot/test/Makefile
--- a/hotspot/test/Makefile	Fri Dec 05 23:21:29 2014 +0000
+++ b/hotspot/test/Makefile	Sat Dec 06 04:30:00 2014 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
@@ -271,6 +271,9 @@
 # Ignore tests are not run and completely silent about it
 JTREG_IGNORE_OPTION = -ignore:quiet
 JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
+# Multiply by 4 the timeout factor
+JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
+JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
 # Add any extra options
 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 # Set other vm and test options