stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8166156: Convert test_semaphore to GTest

Browse Source 
Reviewed-by: kbarrett, tschatzl, stefank
This commit is contained in:
Kirill Zhaldybin 2016-11-28 18:54:30 +03:00
parent 9b7be3512e
commit f2dcdc6fb5
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/share/vm/utilities/internalVMTests.cpp
View File

@ -41,7 +41,6 @@ void InternalVMTests::run_test(const char* name, void (*test)()) {
void InternalVMTests::run() { void InternalVMTests::run() {
tty->print_cr("Running internal VM tests"); tty->print_cr("Running internal VM tests");
run_unit_test(test_semaphore);
run_unit_test(TestReservedSpace_test); run_unit_test(TestReservedSpace_test);
run_unit_test(TestReserveMemorySpecial_test); run_unit_test(TestReserveMemorySpecial_test);
run_unit_test(TestVirtualSpace_test); run_unit_test(TestVirtualSpace_test);

38
hotspot/src/share/vm/runtime/semaphore.cpp → hotspot/test/native/runtime/test_semaphore.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -19,16 +19,11 @@
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*
*/ */
#include "precompiled.hpp" #include "precompiled.hpp"
#include "utilities/debug.hpp"
#include "runtime/semaphore.hpp" #include "runtime/semaphore.hpp"
#include "unittest.hpp"
/////////////// Unit tests ///////////////
#ifndef PRODUCT
static void test_semaphore_single_separate(uint count) { static void test_semaphore_single_separate(uint count) {
Semaphore sem(0); Semaphore sem(0);
@ -67,7 +62,19 @@ static void test_semaphore_many(uint value, uint max, uint increments) {
} }
} }
static void test_semaphore_many() { TEST(Semaphore, single_separate) {
for (uint i = 1; i < 10; i++) {
test_semaphore_single_separate(i);
}
}
TEST(Semaphore, single_combined) {
for (uint i = 1; i < 10; i++) {
test_semaphore_single_combined(i);
}
}
TEST(Semaphore, many) {
for (uint max = 0; max < 10; max++) { for (uint max = 0; max < 10; max++) {
for (uint value = 0; value < max; value++) { for (uint value = 0; value < max; value++) {
for (uint inc = 1; inc <= max - value; inc++) { for (uint inc = 1; inc <= max - value; inc++) {
@ -76,18 +83,3 @@ static void test_semaphore_many() {
} }
} }
} }
void test_semaphore() {
for (uint i = 1; i < 10; i++) {
test_semaphore_single_separate(i);
}
for (uint i = 0; i < 10; i++) {
test_semaphore_single_combined(i);
}
test_semaphore_many();
}
#endif // PRODUCT