Skip to content

Commit bb72eb0

Browse files
committed
Disable AArch64 SpinPause tests on Windows
1 parent 708970a commit bb72eb0

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

test/hotspot/gtest/aarch64/test_spin_pause.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* questions.
2222
*/
2323

24-
#if defined(AARCH64) && !defined(ZERO)
24+
#if defined(AARCH64) && !defined(ZERO) && !defined(_WINDOWS)
2525

2626
#include "utilities/spinYield.hpp"
2727
#include "unittest.hpp"

test/hotspot/jtreg/gtest/TestSpinPauseAArch64.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* @library /test/lib
2929
* @requires vm.flagless
3030
* @requires os.arch=="aarch64"
31+
* @requires os.family != "windows"
3132
* @run main/native GTestWrapper --gtest_filter=SpinPause*
3233
* @run main/native GTestWrapper --gtest_filter=SpinPause* -XX:+UnlockDiagnosticVMOptions -XX:OnSpinWaitInst=none
3334
* @run main/native GTestWrapper --gtest_filter=SpinPause* -XX:+UnlockDiagnosticVMOptions -XX:OnSpinWaitInst=nop
@@ -41,6 +42,6 @@
4142
* @summary Run SpinPause gtest using SB instruction for SpinPause
4243
* @library /test/lib
4344
* @requires vm.flagless
44-
* @requires (os.arch=="aarch64" & vm.cpu.features ~= ".*sb.*")
45+
* @requires (os.arch=="aarch64" & vm.cpu.features ~= ".*sb.*" & os.family != "windows")
4546
* @run main/native GTestWrapper --gtest_filter=SpinPause* -XX:+UnlockDiagnosticVMOptions -XX:OnSpinWaitInst=sb
4647
*/

0 commit comments

Comments
 (0)