Skip to content

Commit 744f206

Browse files
committed
8318525: Atomic gtest should run as TEST_VM to access VM capabilities
Reviewed-by: stefank, stuefe
1 parent 8099261 commit 744f206

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

test/hotspot/gtest/runtime/test_atomic.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@ struct AtomicAddTestSupport {
5353
}
5454
};
5555

56-
TEST(AtomicAddTest, int32) {
56+
TEST_VM(AtomicAddTest, int32) {
5757
using Support = AtomicAddTestSupport<int32_t>;
5858
Support().test_add();
5959
Support().test_fetch_add();
6060
}
6161

6262
// 64bit Atomic::add is only supported on 64bit platforms.
6363
#ifdef _LP64
64-
TEST(AtomicAddTest, int64) {
64+
TEST_VM(AtomicAddTest, int64) {
6565
using Support = AtomicAddTestSupport<int64_t>;
6666
Support().test_add();
6767
Support().test_fetch_add();
6868
}
6969
#endif // _LP64
7070

71-
TEST(AtomicAddTest, ptr) {
71+
TEST_VM(AtomicAddTest, ptr) {
7272
uint _test_values[10] = {};
7373
uint* volatile _test_value{};
7474

@@ -103,14 +103,14 @@ struct AtomicXchgTestSupport {
103103
}
104104
};
105105

106-
TEST(AtomicXchgTest, int32) {
106+
TEST_VM(AtomicXchgTest, int32) {
107107
using Support = AtomicXchgTestSupport<int32_t>;
108108
Support().test();
109109
}
110110

111111
// 64bit Atomic::xchg is only supported on 64bit platforms.
112112
#ifdef _LP64
113-
TEST(AtomicXchgTest, int64) {
113+
TEST_VM(AtomicXchgTest, int64) {
114114
using Support = AtomicXchgTestSupport<int64_t>;
115115
Support().test();
116116
}
@@ -136,12 +136,12 @@ struct AtomicCmpxchgTestSupport {
136136
}
137137
};
138138

139-
TEST(AtomicCmpxchgTest, int32) {
139+
TEST_VM(AtomicCmpxchgTest, int32) {
140140
using Support = AtomicCmpxchgTestSupport<int32_t>;
141141
Support().test();
142142
}
143143

144-
TEST(AtomicCmpxchgTest, int64) {
144+
TEST_VM(AtomicCmpxchgTest, int64) {
145145
using Support = AtomicCmpxchgTestSupport<int64_t>;
146146
Support().test();
147147
}
@@ -186,7 +186,7 @@ struct AtomicCmpxchg1ByteStressSupport {
186186
}
187187
};
188188

189-
TEST(AtomicCmpxchg1Byte, stress) {
189+
TEST_VM(AtomicCmpxchg1Byte, stress) {
190190
AtomicCmpxchg1ByteStressSupport support;
191191
support.test();
192192
}
@@ -224,7 +224,7 @@ namespace AtomicEnumTestUnscoped { // Scope the enumerators.
224224
enum TestEnum { A, B, C };
225225
}
226226

227-
TEST(AtomicEnumTest, unscoped_enum) {
227+
TEST_VM(AtomicEnumTest, unscoped_enum) {
228228
using namespace AtomicEnumTestUnscoped;
229229
using Support = AtomicEnumTestSupport<TestEnum>;
230230

@@ -235,7 +235,7 @@ TEST(AtomicEnumTest, unscoped_enum) {
235235

236236
enum class AtomicEnumTestScoped { A, B, C };
237237

238-
TEST(AtomicEnumTest, scoped_enum) {
238+
TEST_VM(AtomicEnumTest, scoped_enum) {
239239
const AtomicEnumTestScoped B = AtomicEnumTestScoped::B;
240240
const AtomicEnumTestScoped C = AtomicEnumTestScoped::C;
241241
using Support = AtomicEnumTestSupport<AtomicEnumTestScoped>;
@@ -329,28 +329,28 @@ const T AtomicBitopsTestSupport<T>::_old_value;
329329
template<typename T>
330330
const T AtomicBitopsTestSupport<T>::_change_value;
331331

332-
TEST(AtomicBitopsTest, int8) {
332+
TEST_VM(AtomicBitopsTest, int8) {
333333
AtomicBitopsTestSupport<int8_t>()();
334334
}
335335

336-
TEST(AtomicBitopsTest, uint8) {
336+
TEST_VM(AtomicBitopsTest, uint8) {
337337
AtomicBitopsTestSupport<uint8_t>()();
338338
}
339339

340-
TEST(AtomicBitopsTest, int32) {
340+
TEST_VM(AtomicBitopsTest, int32) {
341341
AtomicBitopsTestSupport<int32_t>()();
342342
}
343343

344-
TEST(AtomicBitopsTest, uint32) {
344+
TEST_VM(AtomicBitopsTest, uint32) {
345345
AtomicBitopsTestSupport<uint32_t>()();
346346
}
347347

348348
#ifdef _LP64
349-
TEST(AtomicBitopsTest, int64) {
349+
TEST_VM(AtomicBitopsTest, int64) {
350350
AtomicBitopsTestSupport<int64_t>()();
351351
}
352352

353-
TEST(AtomicBitopsTest, uint64) {
353+
TEST_VM(AtomicBitopsTest, uint64) {
354354
AtomicBitopsTestSupport<uint64_t>()();
355355
}
356356
#endif // _LP64

0 commit comments

Comments
 (0)