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

8242931: Few more tests that use nashorn have been missed

Browse Source 
Reviewed-by: dfuchs, dholmes
This commit is contained in:
Athijegannathan Sundararajan 2020-04-17 09:50:02 +05:30
parent 59563a4ca9
commit b09a8ee657
8 changed files with 15 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/hotspot/jtreg/ProblemList.txt
View File

@ -73,6 +73,8 @@ compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
compiler/c2/Test8004741.java 8235801 generic-all
compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java 8242923 generic-all
#############################################################################
# :hotspot_gc
@ -93,6 +95,7 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64
runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
runtime/ReservedStack/ReservedStackTest.java 8231031 generic-all
runtime/CompactStrings/TestMethodNames.java 8242921 generic-all
#############################################################################

3
test/hotspot/jtreg/TEST.groups
View File

@ -177,8 +177,7 @@ ctw_3 = \
applications/ctw/modules/jdk_compiler.java \
applications/ctw/modules/jdk_internal_vm_compiler.java \
applications/ctw/modules/jdk_localedata.java \
applications/ctw/modules/jdk_localedata_2.java \
applications/ctw/modules/jdk_scripting_nashorn.java \
applications/ctw/modules/jdk_localedata_2.java
tier1_gc = \
:tier1_gc_1 \

39
test/hotspot/jtreg/applications/ctw/modules/jdk_scripting_nashorn.java
View File

@ -1,39 +0,0 @@
/*
* Copyright (c) 2017, 2019, 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
* @summary run CTW for all classes from jdk.scripting.nashorn module
*
* @library /test/lib / /testlibrary/ctw/src
* @modules java.base/jdk.internal.access
* java.base/jdk.internal.jimage
* java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
* @modules jdk.scripting.nashorn
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver/timeout=7200 sun.hotspot.tools.ctw.CtwRunner modules:jdk.scripting.nashorn
*/

39
test/hotspot/jtreg/applications/ctw/modules/jdk_scripting_nashorn_shell.java
View File

@ -1,39 +0,0 @@
/*
* Copyright (c) 2017, 2019, 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
* @summary run CTW for all classes from jdk.scripting.nashorn.shell module
*
* @library /test/lib / /testlibrary/ctw/src
* @modules java.base/jdk.internal.access
* java.base/jdk.internal.jimage
* java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
* @modules jdk.scripting.nashorn.shell
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver/timeout=7200 sun.hotspot.tools.ctw.CtwRunner modules:jdk.scripting.nashorn.shell
*/

23
test/hotspot/jtreg/compiler/aot/scripts/jdk.scripting.nashorn-list.txt
View File

@ -1,23 +0,0 @@
# Copyright (c) 2017, 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.
exclude jdk.nashorn.internal.objects.*
exclude jdk.nashorn.internal.ir.debug.*

74
test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh
View File

@ -1,74 +0,0 @@
# Copyright (c) 2017, 2019, 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.
pushd `dirname $0` > /dev/null
DIR=`pwd`
popd > /dev/null
# set env variables
. $DIR/test-env.sh
$JAVA_HOME/bin/java -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:+PrintAOT -version | grep "aot library" || exit 1
# Dump CDS archive.
$JAVA_HOME/bin/java -Xshare:dump || exit 1
FILE="empty.js"
TIMEFORMAT="%3R"
N=5
rm -f libjdk.nashorn.$SO_TYPE
$JAVA_HOME/bin/jaotc --info --compile-commands jdk.scripting.nashorn-list.txt --module jdk.scripting.nashorn --output libjdk.nashorn.$SO_TYPE || exit 1
echo "Tiered C1:"
for i in `seq 1 $N`; do
time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 $FILE
if [ $? -ne 0 ]; then
exit 1
fi
done
echo "Tiered C1/C2:"
for i in `seq 1 $N`; do
time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT $FILE
if [ $? -ne 0 ]; then
exit 1
fi
done
echo "Tiered AOT:"
for i in `seq 1 $N`; do
time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
if [ $? -ne 0 ]; then
exit 1
fi
done
echo "Tiered AOT -Xshare:on:"
for i in `seq 1 $N`; do
time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-Xshare:on -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
if [ $? -ne 0 ]; then
exit 1
fi
done
rm -f libjdk.nashorn.$SO_TYPE

11
test/jdk/ProblemList.txt
View File

@ -911,6 +911,10 @@ sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all
tools/jlink/JLinkReproducibleTest.java 8217166 windows-all
tools/jlink/ModuleNamesOrderTest.java 8242860 generic-all
############################################################################
# jdk_jdi
@ -929,6 +933,8 @@ com/sun/jdi/InvokeHangTest.java 8218463 linux-al
# jdk_util
java/util/ServiceLoader/ReloadTest.java 8242935 generic-all
############################################################################
# jdk_instrument
@ -960,6 +966,11 @@ javax/script/Test7.java 8239361 generic-
jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java 8228990,8229370 generic-all
jdk/jfr/event/compiler/TestCodeSweeper.java 8225209 generic-all
jdk/jfr/api/consumer/TestHiddenMethod.java 8242933 generic-all
jdk/jfr/tool/TestPrintJSON.java 8242934 generic-all
############################################################################
# jdk_internal

1
test/langtools/jdk/jshell/CompletenessStressTest.java
View File

@ -91,7 +91,6 @@ public class CompletenessStressTest extends KullaTesting {
public File[] getDirectoriesToTest() {
return new File[]{
new File(JDK_ROOT_SRC, "nashorn/src"),
new File(JDK_ROOT_SRC, "langtools/src"),
new File(JDK_ROOT_SRC, "jaxp/src"),
new File(JDK_ROOT_SRC, "jaxws/src"),