Skip to content
Permalink
Browse files
8264408: test_oopStorage no longer needs to disable some tests on WIN32
Reviewed-by: shade, tschatzl
  • Loading branch information
tstuefe committed May 18, 2021
1 parent f6c2891 commit da7c846a8c52c32babae1c545aa17d4b9bd85e76
Showing with 0 additions and 11 deletions.
  1. +0 −11 test/hotspot/gtest/gc/shared/test_oopStorage.cpp
@@ -41,13 +41,6 @@
#include "utilities/quickSort.hpp"
#include "unittest.hpp"

// --- FIXME: Disable some tests on 32bit Windows, because SafeFetch
// (which is used by allocation_status) doesn't currently provide
// protection in the context where gtests are run; see JDK-8185734.
#ifdef _WIN32
#define DISABLE_GARBAGE_ALLOCATION_STATUS_TESTS
#endif

// Access storage internals.
class OopStorage::TestAccess : public AllStatic {
public:
@@ -1056,9 +1049,7 @@ TEST_VM_F(OopStorageTestWithAllocation, allocation_status) {

EXPECT_EQ(OopStorage::ALLOCATED_ENTRY, _storage.allocation_status(retained));
EXPECT_EQ(OopStorage::UNALLOCATED_ENTRY, _storage.allocation_status(released));
#ifndef DISABLE_GARBAGE_ALLOCATION_STATUS_TESTS
EXPECT_EQ(OopStorage::INVALID_ENTRY, _storage.allocation_status(garbage));
#endif

for (size_t i = 0; i < _max_entries; ++i) {
if ((_entries[i] != retained) && (_entries[i] != released)) {
@@ -1072,10 +1063,8 @@ TEST_VM_F(OopStorageTestWithAllocation, allocation_status) {
while (_storage.delete_empty_blocks()) {}
}
EXPECT_EQ(OopStorage::ALLOCATED_ENTRY, _storage.allocation_status(retained));
#ifndef DISABLE_GARBAGE_ALLOCATION_STATUS_TESTS
EXPECT_EQ(OopStorage::INVALID_ENTRY, _storage.allocation_status(released));
EXPECT_EQ(OopStorage::INVALID_ENTRY, _storage.allocation_status(garbage));
#endif // DISABLE_GARBAGE_ALLOCATION_STATUS_TESTS
}

TEST_VM_F(OopStorageTest, usage_info) {

0 comments on commit da7c846

Please sign in to comment.