8130255: [TESTBUG] closed/runtime/4784641/CheckedIsSameObjectTest fails when running 32-bit ARM binaries on 64-bit ARM hosts
Rewrote test in Java with a number of changes Reviewed-by: ctornqvi, gtriantafill, ddmitriev
This commit is contained in:
parent
333927f512
commit
0064189ab6
hotspot
@ -45,6 +45,7 @@ BUILD_HOTSPOT_JTREG_NATIVE_SRC := \
|
||||
$(HOTSPOT_TOPDIR)/test/runtime/jni/8025979 \
|
||||
$(HOTSPOT_TOPDIR)/test/runtime/jni/8033445 \
|
||||
$(HOTSPOT_TOPDIR)/test/runtime/jni/ToStringInInterfaceTest \
|
||||
$(HOTSPOT_TOPDIR)/test/runtime/SameObject \
|
||||
#
|
||||
|
||||
BUILD_HOTSPOT_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/hotspot/jtreg/native
|
||||
|
67
hotspot/test/runtime/SameObject/SameObject.java
Normal file
67
hotspot/test/runtime/SameObject/SameObject.java
Normal file
@ -0,0 +1,67 @@
|
||||
/*
|
||||
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import jdk.test.lib.Asserts;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @key cte_test
|
||||
* @bug 4784641
|
||||
* @summary -Xcheck:jni overly strict in JNI method IsSameObject
|
||||
* Fixed in JDK1.3.1_10
|
||||
* Fixed in JDK1.4.1_07
|
||||
* @library /testlibrary
|
||||
* @run main/othervm/native -Xcheck:jni SameObject
|
||||
*/
|
||||
public class SameObject {
|
||||
|
||||
public Object obj = new Object();
|
||||
|
||||
static {
|
||||
System.loadLibrary("SameObject");
|
||||
}
|
||||
|
||||
public native void createWeakRef(Object obj);
|
||||
|
||||
public native int checkWeakRef();
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
SameObject sameObject = new SameObject();
|
||||
|
||||
int result = sameObject.test();
|
||||
Asserts.assertEquals(result, 0, "WeakRef still alive");
|
||||
}
|
||||
|
||||
public int test() {
|
||||
createWeakRef(obj);
|
||||
obj = null;
|
||||
System.gc();
|
||||
try {
|
||||
Thread.sleep(2000);
|
||||
} catch (InterruptedException ex) {
|
||||
System.out.println("Interrupted");
|
||||
}
|
||||
|
||||
return checkWeakRef();
|
||||
}
|
||||
}
|
46
hotspot/test/runtime/SameObject/libSameObject.c
Normal file
46
hotspot/test/runtime/SameObject/libSameObject.c
Normal file
@ -0,0 +1,46 @@
|
||||
/*
|
||||
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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
|
||||
* questions.
|
||||
*/
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
static jobject weakRef;
|
||||
|
||||
/*
|
||||
* Class: SameObject
|
||||
* Method: createWeakRef
|
||||
* Signature: (Ljava/lang/Object;)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_SameObject_createWeakRef
|
||||
(JNIEnv *env, jobject obj1, jobject obj2) {
|
||||
weakRef = (*env)->NewWeakGlobalRef(env, obj2);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: SameObject
|
||||
* Method: checkWeakRef
|
||||
* Signature: ()I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL Java_SameObject_checkWeakRef
|
||||
(JNIEnv *env, jobject obj) {
|
||||
return (*env)->IsSameObject(env, weakRef, NULL) ? 0 : 1;
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user