Skip to content

Commit 8823626

Browse files
committed
8309048: Remove malloc locker test case
Reviewed-by: dholmes, tschatzl, coleenp, lmesnik
1 parent 927a9ed commit 8823626

File tree

9 files changed

+1
-241
lines changed

9 files changed

+1
-241
lines changed

make/test/JtregNativeHotspot.gmk

-7
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ NSK_GC_LOCK_JVMTI_INCLUDES := \
9999
-I$(VM_TESTBASE_DIR)/nsk/share/native \
100100
-I$(VM_TESTBASE_DIR)/nsk/share/jni
101101

102-
NSK_GC_LOCK_MALLOC_INCLUDES := \
103-
-I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/malloc \
104-
-I$(VM_TESTBASE_DIR)/nsk/share/native \
105-
-I$(VM_TESTBASE_DIR)/nsk/share/jni
106-
107102
NSK_GC_LOCK_JNI_INCLUDES := \
108103
-I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jni \
109104
-I$(VM_TESTBASE_DIR)/nsk/share/native \
@@ -179,8 +174,6 @@ BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativeAndMH := $(MLVM_STRESS_INCLUDES)
179174

180175
BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJVMTIAllocLocker := $(NSK_GC_LOCK_JVMTI_INCLUDES)
181176

182-
BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libMallocLocker := $(NSK_GC_LOCK_MALLOC_INCLUDES)
183-
184177
BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libBooleanArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
185178
BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libByteArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
186179
BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libCharArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)

test/hotspot/jtreg/TEST.quick-groups

+1-2
Original file line numberDiff line numberDiff line change
@@ -1492,8 +1492,7 @@ vmTestbase_vm_gc_quick = \
14921492
vmTestbase/gc/gctests/ReferencesGC/ReferencesGC.java \
14931493
vmTestbase/gc/lock/jni/jnilock001/TestDescription.java \
14941494
vmTestbase/gc/lock/jniref/jnireflock01/TestDescription.java \
1495-
vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock01/TestDescription.java \
1496-
vmTestbase/gc/lock/malloc/malloclock01/TestDescription.java
1495+
vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock01/TestDescription.java
14971496

14981497
vmTestbase_vm_compiler_quick = \
14991498
vmTestbase/vm/compiler/jbe/constprop/constprop01/constprop01.java \

test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock01/TEST.properties

-23
This file was deleted.

test/hotspot/jtreg/vmTestbase/gc/lock/malloc/malloclock01/TestDescription.java

-38
This file was deleted.

test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/LockerUtils.java

-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import nsk.share.TestBug;
2727
import nsk.share.gc.lock.jni.JNILockers;
28-
import nsk.share.gc.lock.malloc.MallocLockers;
2928
import nsk.share.gc.lock.jvmti.JVMTIAllocLockers;
3029
import nsk.share.gc.lock.jniref.*;
3130

@@ -52,8 +51,6 @@ else if (id.equals("jniRef"))
5251
return new JNIRefLockers();
5352
else if (id.equals("jniWeakGlobalRef"))
5453
return new JNIWeakGlobalRefLockers();
55-
else if (id.equals("malloc"))
56-
return new MallocLockers();
5754
else if (id.equals("jvmtiAlloc"))
5855
return new JVMTIAllocLockers();
5956
else

test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/malloc/MallocLocker.cpp

-51
This file was deleted.

test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/malloc/MallocLocker.java

-57
This file was deleted.

test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/malloc/MallocLockers.java

-34
This file was deleted.

test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/malloc/libMallocLocker.cpp

-26
This file was deleted.

0 commit comments

Comments
 (0)