mirror of
https://github.com/JetBrains/JetBrainsRuntime.git
synced 2025-12-06 09:29:38 +01:00
8349348: Refactor ClassLoaderDeadlock.sh and Deadlock.sh to run fully in java
Backport-of: 32d6d03151
This commit is contained in:
Goetz Lindenmaier
committed by
Vitaly Provodin
Vitaly Provodin
parent
72ec605962
commit
d9ee002127
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2025, 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
|
||||
@@ -21,7 +21,14 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
// See bug 5094825 / ClassLoadDeadlock.sh
|
||||
/*
|
||||
* @test
|
||||
* @bug 5094825
|
||||
* @summary verify no deadlock if crypto provider in other classloader is used to verify signed jars
|
||||
* @library ./Deadlock.jar
|
||||
* @compile provider/HashProvider.java
|
||||
* @run main/othervm/timeout=30 ClassLoaderDeadlock
|
||||
*/
|
||||
|
||||
import java.net.*;
|
||||
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2004, 2024, 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.
|
||||
#
|
||||
|
||||
# @test
|
||||
# @bug 5094825
|
||||
# @summary verify no deadlock if crypto provider in other classloader is used to verify signed jars
|
||||
#
|
||||
# @run shell/timeout=30 ClassLoaderDeadlock.sh
|
||||
|
||||
# set a few environment variables so that the shell-script can run stand-alone
|
||||
# in the source directory
|
||||
if [ "${TESTSRC}" = "" ] ; then
|
||||
TESTSRC="."
|
||||
fi
|
||||
|
||||
if [ "${TESTCLASSES}" = "" ] ; then
|
||||
TESTCLASSES="."
|
||||
fi
|
||||
|
||||
if [ "${TESTJAVA}" = "" ] ; then
|
||||
echo "TESTJAVA not set. Test cannot execute."
|
||||
echo "FAILED!!!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "${COMPILEJAVA}" = "" ]; then
|
||||
COMPILEJAVA="${TESTJAVA}"
|
||||
fi
|
||||
|
||||
# set platform-dependent variables
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Linux )
|
||||
PATHSEP=":"
|
||||
FILESEP="/"
|
||||
;;
|
||||
Darwin )
|
||||
PATHSEP=":"
|
||||
FILESEP="/"
|
||||
;;
|
||||
AIX )
|
||||
PATHSEP=":"
|
||||
FILESEP="/"
|
||||
;;
|
||||
CYGWIN* )
|
||||
PATHSEP=";"
|
||||
FILESEP="/"
|
||||
;;
|
||||
Windows* )
|
||||
PATHSEP=";"
|
||||
FILESEP="\\"
|
||||
;;
|
||||
* )
|
||||
echo "Unrecognized system!"
|
||||
exit 1;
|
||||
;;
|
||||
esac
|
||||
|
||||
cd ${TESTCLASSES}${FILESEP}
|
||||
if [ ! -d provider ] ; then
|
||||
mkdir provider
|
||||
fi
|
||||
|
||||
# compile the test program
|
||||
${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
|
||||
-d ${TESTCLASSES}${FILESEP} \
|
||||
${TESTSRC}${FILESEP}ClassLoaderDeadlock.java
|
||||
|
||||
${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
|
||||
-d ${TESTCLASSES}${FILESEP}provider${FILESEP} \
|
||||
${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
|
||||
|
||||
# run the test
|
||||
${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
|
||||
-classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
|
||||
-Djava.awt.headless=true \
|
||||
ClassLoaderDeadlock
|
||||
|
||||
STATUS=$?
|
||||
|
||||
# clean up
|
||||
rm -f 'ClassLoaderDeadlock.class' 'ClassLoaderDeadlock$1.class' \
|
||||
'ClassLoaderDeadlock$DelayClassLoader.class' \
|
||||
provider${FILESEP}HashProvider.class
|
||||
|
||||
exit $STATUS
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2025, 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
|
||||
@@ -21,8 +21,13 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
|
||||
// see Deadlock.sh
|
||||
/*
|
||||
* @test
|
||||
* @bug 4944382
|
||||
* @summary make sure we do not deadlock loading signed JAR with getInstance()
|
||||
* @library ./Deadlock.jar
|
||||
* @run main/othervm/timeout=30 Deadlock
|
||||
*/
|
||||
|
||||
import java.security.*;
|
||||
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright (c) 2003, 2024, 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.
|
||||
#
|
||||
|
||||
|
||||
# @test
|
||||
# @bug 4944382
|
||||
# @summary make sure we do not deadlock loading signed JAR with getInstance()
|
||||
# @author Andreas Sterbenz
|
||||
# @build Deadlock
|
||||
# @run shell/timeout=30 Deadlock.sh
|
||||
|
||||
# set platform-dependent variables
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Linux )
|
||||
PATHSEP=":"
|
||||
FILESEP="/"
|
||||
;;
|
||||
Darwin )
|
||||
PATHSEP=":"
|
||||
FILESEP="/"
|
||||
;;
|
||||
AIX )
|
||||
PATHSEP=":"
|
||||
FILESEP="/"
|
||||
;;
|
||||
CYGWIN* )
|
||||
PATHSEP=";"
|
||||
FILESEP="/"
|
||||
;;
|
||||
Windows* )
|
||||
PATHSEP=";"
|
||||
FILESEP="\\"
|
||||
;;
|
||||
* )
|
||||
echo "Unrecognized system!"
|
||||
exit 1;
|
||||
;;
|
||||
esac
|
||||
|
||||
JAVA="${TESTJAVA}${FILESEP}bin${FILESEP}java"
|
||||
|
||||
${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
|
||||
|
||||
Reference in New Issue
Block a user