From d38f417e0b413c97a5b502776289f4351d24e6b9 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 31 Jan 2024 16:59:40 +0000
Subject: [PATCH 1/5] increase timeout factor to 16

---
 openjdk/openjdk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index af97720cfc..7d610ad677 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -87,7 +87,7 @@ else
 ifneq ($(OS),OS/390)
 	JTREG_TIMEOUT_OPTION =  -timeoutFactor:8
 else
-	JTREG_TIMEOUT_OPTION =  -timeoutFactor:2
+	JTREG_TIMEOUT_OPTION =  -timeoutFactor:16
 endif
 endif
 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)

From 36869b3469e8bb005bb540d6f4f9600be80191ce Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 31 Jan 2024 17:23:47 +0000
Subject: [PATCH 2/5] increase timeout to 40

---
 openjdk/openjdk.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index 7d610ad677..a7af4b358f 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -85,9 +85,9 @@ ifeq ($(ARCH), riscv64)
 else
 # Multiple by 8 the timeout numbers, except on zOS use 2
 ifneq ($(OS),OS/390)
-	JTREG_TIMEOUT_OPTION =  -timeoutFactor:8
+	JTREG_TIMEOUT_OPTION =  -timeoutFactor:40
 else
-	JTREG_TIMEOUT_OPTION =  -timeoutFactor:16
+	JTREG_TIMEOUT_OPTION =  -timeoutFactor:2
 endif
 endif
 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)

From 6b4cfeefc6c61eecc74b42d89fb13420fbd53eba Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Thu, 1 Feb 2024 12:35:35 +0000
Subject: [PATCH 3/5] custom concurrency

---
 openjdk/openjdk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index a7af4b358f..02a4444faf 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -64,7 +64,7 @@ ifeq ($(JTREG_CONC), 0)
 		JTREG_CONC := 1
 	endif
 endif
-EXTRA_JTREG_OPTIONS += -concurrency:$(JTREG_CONC)
+EXTRA_JTREG_OPTIONS += -concurrency:2
 
 JTREG_BASIC_OPTIONS += -agentvm
 # Only run automatic tests

From e030b4d5aefa6ee6af83fe58bff4bd6bd64c563c Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Fri, 2 Feb 2024 18:17:48 +0000
Subject: [PATCH 4/5] restore earlier changes, use nproc to find number of
 processors

---
 openjdk/openjdk.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index 02a4444faf..8bbb7af2e8 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -19,7 +19,7 @@ OS:=$(shell uname -s)
 ARCH:=$(shell uname -m)
 
 ifeq ($(OS),Linux)
-	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+	NPROCS:=$(shell nproc)
 	MEMORY_SIZE:=$(shell KMEMMB=`awk '/^MemTotal:/{print int($$2/1024)}' /proc/meminfo`; if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then CGMEM=`cat /sys/fs/cgroup/memory/memory.limit_in_bytes`; else CGMEM=`expr $${KMEMMB} \* 1024`; fi; CGMEMMB=`expr $${CGMEM} / 1024`; if [ "$${KMEMMB}" -lt "$${CGMEMMB}" ]; then echo "$${KMEMMB}"; else echo "$${CGMEMMB}"; fi)
 endif
 ifeq ($(OS),Darwin)
@@ -64,7 +64,7 @@ ifeq ($(JTREG_CONC), 0)
 		JTREG_CONC := 1
 	endif
 endif
-EXTRA_JTREG_OPTIONS += -concurrency:2
+EXTRA_JTREG_OPTIONS += -concurrency:$(CONC)
 
 JTREG_BASIC_OPTIONS += -agentvm
 # Only run automatic tests
@@ -85,7 +85,7 @@ ifeq ($(ARCH), riscv64)
 else
 # Multiple by 8 the timeout numbers, except on zOS use 2
 ifneq ($(OS),OS/390)
-	JTREG_TIMEOUT_OPTION =  -timeoutFactor:40
+	JTREG_TIMEOUT_OPTION =  -timeoutFactor:8
 else
 	JTREG_TIMEOUT_OPTION =  -timeoutFactor:2
 endif

From 22600227a2ff230a7d7e731e806be52a3e430a4a Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Fri, 2 Feb 2024 18:19:07 +0000
Subject: [PATCH 5/5] restore JTREG_CONC

---
 openjdk/openjdk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index 8bbb7af2e8..cf4323dc75 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -64,7 +64,7 @@ ifeq ($(JTREG_CONC), 0)
 		JTREG_CONC := 1
 	endif
 endif
-EXTRA_JTREG_OPTIONS += -concurrency:$(CONC)
+EXTRA_JTREG_OPTIONS += -concurrency:$(JTREG_CONC)
 
 JTREG_BASIC_OPTIONS += -agentvm
 # Only run automatic tests