From 247b5ccd8e5ee5af682312f049692ee46b510bdc Mon Sep 17 00:00:00 2001
From: Ludovic Henry <git@ludovic.dev>
Date: Wed, 6 Mar 2024 14:54:07 +0100
Subject: [PATCH] Disabled NaN-related tests on RISC-V more broadly (#5125)

The issue is not related with the version of the JDK, but rather with
how the RISC-V architecture handles NaN and the expectations of the
test.
---
 perf/renaissance/playlist.xml     | 1 -
 system/mauveLoadTest/playlist.xml | 3 ---
 system/otherLoadTest/playlist.xml | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/perf/renaissance/playlist.xml b/perf/renaissance/playlist.xml
index d0bc5298cf..1d76327f1e 100644
--- a/perf/renaissance/playlist.xml
+++ b/perf/renaissance/playlist.xml
@@ -330,7 +330,6 @@
 		<disables>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>
diff --git a/system/mauveLoadTest/playlist.xml b/system/mauveLoadTest/playlist.xml
index 23be2b9f35..e0b954f834 100644
--- a/system/mauveLoadTest/playlist.xml
+++ b/system/mauveLoadTest/playlist.xml
@@ -43,7 +43,6 @@
 		<disables>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>
@@ -91,7 +90,6 @@
 		<disables>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>
@@ -118,7 +116,6 @@
 		<disables>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>
diff --git a/system/otherLoadTest/playlist.xml b/system/otherLoadTest/playlist.xml
index f9080c86e1..11287210d7 100644
--- a/system/otherLoadTest/playlist.xml
+++ b/system/otherLoadTest/playlist.xml
@@ -42,7 +42,6 @@
 			</disable>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>
@@ -76,7 +75,6 @@
 			</disable>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>
@@ -185,7 +183,6 @@
 			</disable>
 			<disable>
 				<comment>https://github.com/adoptium/aqa-tests/issues/4976</comment>
-				<version>17+</version>
 				<impl>hotspot</impl>
 				<platform>riscv64_linux</platform>
 			</disable>