mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

8279005: sun/tools/jstat tests do not check for test case exit codes after JDK-8245129

Browse Source 
Backport-of: c90c31b07e
This commit is contained in:
Paul Hohensee
2025-08-21 16:25:42 +00:00
committed by Vitaly Provodin
parent d1b8a8d797
commit bde42a41ce
16 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/jdk/sun/tools/jstat/jstatGcCapacityOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gccapacity 0 2>&1 | awk -f ${TESTSRC}/gcCapacityOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gccapacity 0 2>&1 | awk -f ${TESTSRC}/gcCapacityOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcCauseOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -38,4 +38,9 @@ JSTAT="${TESTJAVA}/bin/jstat"
# The UseParallelGC collector does not currently update the gc cause counters.
${JSTAT} ${COMMON_JSTAT_FLAGS} -gccause 0 2>&1 | awk -f ${TESTSRC}/gcCauseOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseSerialGC -gccause 0 2>&1 | awk -f ${TESTSRC}/gcCauseOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2013, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcmetacapacity 0 2>&1 | awk -f ${TESTSRC}/gcMetaCapacityOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcmetacapacity 0 2>&1 | awk -f ${TESTSRC}/gcMetaCapacityOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcNewCapacityOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcnewcapacity 0 2>&1 | awk -f ${TESTSRC}/gcNewCapacityOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcnewcapacity 0 2>&1 | awk -f ${TESTSRC}/gcNewCapacityOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcNewOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcnew 0 2>&1 | awk -f ${TESTSRC}/gcNewOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcnew 0 2>&1 | awk -f ${TESTSRC}/gcNewOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcOldCapacityOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcoldcapacity 0 2>&1 | awk -f ${TESTSRC}/gcOldCapacityOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcoldcapacity 0 2>&1 | awk -f ${TESTSRC}/gcOldCapacityOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcOldOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcold 0 2>&1 | awk -f ${TESTSRC}/gcOldOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcold 0 2>&1 | awk -f ${TESTSRC}/gcOldOutput1.awk

7
test/jdk/sun/tools/jstat/jstatGcOutput1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gc 0 2>&1 | awk -f ${TESTSRC}/gcOutput1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gc 0 2>&1 | awk -f ${TESTSRC}/gcOutput1.awk

7
test/jdk/sun/tools/jstat/jstatLineCounts1.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil 0 250 5 2>&1 | awk -f ${TESTSRC}/lineCounts1.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil 0 250 5 2>&1 | awk -f ${TESTSRC}/lineCounts1.awk

7
test/jdk/sun/tools/jstat/jstatLineCounts2.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil 0 2>&1 | awk -f ${TESTSRC}/lineCounts2.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil 0 2>&1 | awk -f ${TESTSRC}/lineCounts2.awk

7
test/jdk/sun/tools/jstat/jstatLineCounts3.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil -h 10 0 250 10 2>&1 | awk -f ${TESTSRC}/lineCounts3.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil -h 10 0 250 10 2>&1 | awk -f ${TESTSRC}/lineCounts3.awk

7
test/jdk/sun/tools/jstat/jstatLineCounts4.sh
View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2004, 2020, 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
@@ -34,4 +34,9 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
${JSTAT} ${COMMON_JSTAT_FLAGS} -gcutil -h 10 0 250 11 2>&1 | awk -f ${TESTSRC}/lineCounts4.awk
RC=$?
if [ $RC -ne 0 ]; then
exit $RC
fi
${JSTAT} ${COMMON_JSTAT_FLAGS} -J-XX:+UseParallelGC -gcutil -h 10 0 250 11 2>&1 | awk -f ${TESTSRC}/lineCounts4.awk

2
test/jdk/sun/tools/jstat/lineCounts1.awk
View File

@@ -29,7 +29,7 @@ BEGIN {
headerlines++;
}
/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
/^[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}

2
test/jdk/sun/tools/jstat/lineCounts2.awk
View File

@@ -21,7 +21,7 @@ BEGIN {
headerlines++;
}
/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
/^[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}

2
test/jdk/sun/tools/jstat/lineCounts3.awk
View File

@@ -39,7 +39,7 @@ BEGIN {
headerlines++;
}
/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
/^[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}

2
test/jdk/sun/tools/jstat/lineCounts4.awk
View File

@@ -44,7 +44,7 @@ BEGIN {
headerlines++;
}
/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
/^[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+\.[0-9]+$/ {
if (headerlines == 2) {
datalines2++;
}