From 6e6b76577b3628b8cca2ecbada4c51b498515d7a Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Tue, 3 Dec 2024 14:15:30 -0500 Subject: [PATCH] Modify JSR166TestCase to gather more error information Update Xdump to catch JUnit exception and AssertionFailedError Signed-off-by: Theresa Mammarella --- .../util/concurrent/tck/JSR166TestCase.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java index db2cecf2932..c8f7bf49efb 100644 --- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java +++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java @@ -39,7 +39,10 @@ * @summary Conformance testing variant of JSR-166 tck tests. * @build * * @modules java.management - * @run junit/othervm/timeout=1000 -Xdump:system+java+snap:events=systhrow,filter=java/lang/Exception,msg_filter=*JUnit* JSR166TestCase + * @run junit/othervm/timeout=1000 + * -Xdump:system+java+snap:events=throw+systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=junit/framework/AssertionFailedError + * JSR166TestCase */ /* @@ -48,7 +51,11 @@ * with java security manager set to allow. * @build * * @modules java.management - * @run junit/othervm/timeout=1000 -Djava.security.manager=allow -Xdump:system+java+snap:events=systhrow,filter=java/lang/Exception,msg_filter=*JUnit* JSR166TestCase + * @run junit/othervm/timeout=1000 + * -Djava.security.manager=allow + * -Xdump:system+java+snap:events=throw+systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=junit/framework/AssertionFailedError + * JSR166TestCase */ /* @@ -62,7 +69,8 @@ * --add-opens java.base/java.lang=ALL-UNNAMED * -Djsr166.testImplementationDetails=true * -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 - * -Xdump:system+java+snap:events=systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=junit/framework/AssertionFailedError * JSR166TestCase * @run junit/othervm/timeout=1000 * --add-opens java.base/java.util.concurrent=ALL-UNNAMED @@ -70,7 +78,8 @@ * -Djsr166.testImplementationDetails=true * -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 * -Djava.util.secureRandomSeed=true - * -Xdump:system+java+snap:events=systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=junit/framework/AssertionFailedError * JSR166TestCase */ @@ -85,13 +94,15 @@ * --add-opens java.base/java.util.concurrent=ALL-UNNAMED * --add-opens java.base/java.lang=ALL-UNNAMED * -Djsr166.testImplementationDetails=true - * -Xdump:system+java+snap:events=systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=junit/framework/AssertionFailedError * JSR166TestCase * @run junit/othervm/timeout=1000/policy=tck.policy * --add-opens java.base/java.util.concurrent=ALL-UNNAMED * --add-opens java.base/java.lang=ALL-UNNAMED * -Djsr166.testImplementationDetails=true - * -Xdump:system+java+snap:events=systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=java/lang/Exception,msg_filter=*JUnit* + * -Xdump:system+java+snap:events=throw+systhrow,filter=junit/framework/AssertionFailedError * JSR166TestCase */