From 61aff6db15d5bdda77427af5ce34d0fe43373197 Mon Sep 17 00:00:00 2001 From: Leonid Mesnik Date: Wed, 15 May 2024 14:57:22 +0000 Subject: [PATCH] 8332112: Update nsk.share.Log to don't print summary during VM shutdown hook Reviewed-by: dholmes, cjplummer --- .../plugAttachConnect001.java | 3 +- .../plugAttachConnect002.java | 3 +- .../plugAttachConnect003.java | 3 +- .../plugLaunchConnect001.java | 3 +- .../plugLaunchConnect002.java | 3 +- .../plugLaunchConnect003.java | 3 +- .../plugListenConnect001.java | 3 +- .../plugListenConnect002.java | 3 +- .../plugListenConnect003.java | 3 +- .../plugMultiConnect001.java | 3 +- .../plugMultiConnect002.java | 3 +- .../plugMultiConnect003.java | 3 +- .../plugMultiConnect004.java | 3 +- .../plugMultiConnect005.java | 3 +- .../plugMultiConnect006.java | 3 +- .../transportService001.java | 3 +- .../transportService002.java | 3 +- .../transportService003.java | 3 +- .../genericSignature/genericSignature001.java | 1 - .../genericSignature001a.java | 3 +- .../genericSignature/genericSignature002.java | 1 - .../genericSignature002a.java | 3 +- .../genericSignature/genericSignature001.java | 1 - .../genericSignature001a.java | 3 +- .../genericSignature/genericSignature002.java | 1 - .../genericSignature002a.java | 3 +- .../createVirtualMachine/createVM001.java | 1 - .../jtreg/vmTestbase/nsk/share/Log.java | 122 ++---------------- .../vmTestbase/nsk/share/jpda/BindServer.java | 4 +- .../vm/mlvm/share/MlvmTestExecutor.java | 3 +- 30 files changed, 34 insertions(+), 166 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java index e6d7e740202..b1badcc533f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -147,7 +147,6 @@ public class plugAttachConnect001 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); String expectedPlugAttachConnectorName = "PlugAttachConnector001_Name"; String expectedPlugAttachConnectorDescription = "PlugAttachConnector001_Description"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java index 18cf8cd4c7b..7c0f8fc8310 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -165,7 +165,6 @@ public class plugAttachConnect002 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); String checkedPlugAttachConnectorName = "PlugAttachConnector002_Name"; String checkedPlugAttachConnectorDescription = "PlugAttachConnector002_Description"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java index b6314aeb390..0bc4527ecf9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -133,7 +133,6 @@ public class plugAttachConnect003 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java index daa70d305aa..096e6b970af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -149,7 +149,6 @@ public class plugLaunchConnect001 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); String expectedPlugLaunchConnectorName = "PlugLaunchConnector001_Name"; String expectedPlugLaunchConnectorDescription = "PlugLaunchConnector001_Description"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java index d395320250a..71c0cc2987e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -165,7 +165,6 @@ public class plugLaunchConnect002 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); String checkedPlugLaunchConnectorName = "PlugLaunchConnector002_Name"; String checkedPlugLaunchConnectorDescription = "PlugLaunchConnector002_Description"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java index 53aa59f9c6b..2f5898dfd86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -133,7 +133,6 @@ public class plugLaunchConnect003 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java index 2f21e2a359e..bab07c442dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -149,7 +149,6 @@ public class plugListenConnect001 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); String expectedPlugListenConnectorName = "PlugListenConnector001_Name"; String expectedPlugListenConnectorDescription = "PlugListenConnector001_Description"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java index 407c3781394..2861c75491f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -165,7 +165,6 @@ public class plugListenConnect002 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); String checkedPlugListenConnectorName = "PlugListenConnector002_Name"; String checkedPlugListenConnectorDescription = "PlugListenConnector002_Description"; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java index 34b4587dacb..300af2f6851 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -133,7 +133,6 @@ public class plugListenConnect003 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java index 720cd845b41..250b30a9472 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -176,7 +176,6 @@ public class plugMultiConnect001 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java index 8fd40809fee..b5f63b7e2ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -201,7 +201,6 @@ public class plugMultiConnect002 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java index 376cdbe7087..6e883c779ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -214,7 +214,6 @@ public class plugMultiConnect003 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java index 64a810a17b2..00b57cb6731 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -233,7 +233,6 @@ public class plugMultiConnect004 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java index 4b13ad99001..577cdd23f9d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -238,7 +238,6 @@ public class plugMultiConnect005 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java index 88f44940ffa..e753a3656fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -263,7 +263,6 @@ public class plugMultiConnect006 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java index ff68a83cbff..bf090ce7fa7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -185,7 +185,6 @@ public class transportService001 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService001 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java index 6a1bb9f78a1..370b5dbd7b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -185,7 +185,6 @@ public class transportService002 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService002 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java index 7716bdd8aae..889942922b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -136,7 +136,6 @@ public class transportService003 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService003 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java index 92b85582c68..20b473062b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java @@ -158,7 +158,6 @@ public class genericSignature001 { argsHandler = new ArgumentHandler(argv); verboseMode = argsHandler.verbose(); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/ReferenceType/genericSignature/genericSignature001 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java index dd41eab3ddc..42c738fa86e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -113,7 +113,6 @@ public class genericSignature001a { argsHandler = new ArgumentHandler(argv); logHandler = new Log(System.err, argsHandler); - logHandler.enableErrorsSummary(false); IOPipe pipe = argsHandler.createDebugeeIOPipe(); logOnVerbose(infoLogPrefixHead + "Debugee started!"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java index 07d8da57c92..781b0f6f4ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java @@ -140,7 +140,6 @@ public class genericSignature002 { argsHandler = new ArgumentHandler(argv); verboseMode = argsHandler.verbose(); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/ReferenceType/genericSignature/genericSignature002 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java index 9be56cd362f..2caa90e0a92 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -86,7 +86,6 @@ public class genericSignature002a { argsHandler = new ArgumentHandler(argv); logHandler = new Log(System.err, argsHandler); - logHandler.enableErrorsSummary(false); IOPipe pipe = argsHandler.createDebugeeIOPipe(); logOnVerbose(infoLogPrefixHead + "Debugee started!"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java index c23ff079c0e..d5368568bec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java @@ -183,7 +183,6 @@ public class genericSignature001 { argsHandler = new ArgumentHandler(argv); verboseMode = argsHandler.verbose(); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/TypeComponent/genericSignature/genericSignature001 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java index 6fe6f41c89f..e479baa584b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -112,7 +112,6 @@ public class genericSignature001a { argsHandler = new ArgumentHandler(argv); logHandler = new Log(System.err, argsHandler); - logHandler.enableErrorsSummary(false); IOPipe pipe = argsHandler.createDebugeeIOPipe(); logOnVerbose(infoLogPrefixHead + "Debugee started!"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java index cb596163da1..8eabd51f713 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java @@ -175,7 +175,6 @@ public class genericSignature002 { argsHandler = new ArgumentHandler(argv); verboseMode = argsHandler.verbose(); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/TypeComponent/genericSignature/genericSignature002 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java index de3b50167c1..476393e39cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -288,7 +288,6 @@ public class genericSignature002a { argsHandler = new ArgumentHandler(argv); logHandler = new Log(System.err, argsHandler); - logHandler.enableErrorsSummary(false); IOPipe pipe = argsHandler.createDebugeeIOPipe(); logOnVerbose(infoLogPrefixHead + "Debugee started!"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java index 5b0363f9dd4..26ad37078d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java @@ -94,7 +94,6 @@ public class createVM001 { argsHandler = new ArgumentHandler(argv); logHandler = new Log(out, argsHandler); - logHandler.enableErrorsSummary(false); logAlways("==> nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001 test..."); logOnVerbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java index 6bdc5266fc4..735f487f6c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -56,9 +56,6 @@ import nsk.share.test.LazyFormatString; * Error messages appeares in log stream in all modes. Additional log massages, * printed with display() method will be filtered out, if log mode * is not verbose. In verbose log made messages of both types are printed. - * Additionally, in verbose mode a summary of all occured errors will be printed - * at the program exit, by automatically invoking method - * printErrorsSummary(). *

* To provide printing messages from different sources into one log * with distinct prefixes use internal Log.Logger class. @@ -69,14 +66,11 @@ import nsk.share.test.LazyFormatString; * @see ArgumentParser * @see Log.Logger */ -public class Log extends FinalizableObject { +public class Log { /** * Report step-by-step activity to this stream. - * - * @deprecated Tests should not use this field directly. */ - @Deprecated - protected PrintStream out = null; + private PrintStream out = null; /** * Is log-mode verbose? @@ -114,7 +108,7 @@ public class Log extends FinalizableObject { public static int nameToLevel(String value) throws IllegalArgumentException { Integer level = NAME_TO_LEVEL_MAP.get(value.toLowerCase()); - if ( level == null ) + if ( level == null ) throw new IllegalArgumentException("Wrong trace level: " + value); return level; @@ -135,16 +129,6 @@ public class Log extends FinalizableObject { */ private int traceLevel = TraceLevel.DEFAULT; - /** - * Is printing errors summary enabled? Default value is true; - */ - private boolean errorsSummaryEnabled = true; - - /** - * Is printing saved verbose messages on error enabled? Default value is true; - */ - private boolean verboseOnErrorEnabled = true; - /** * This errosBuffer will keep all messages printed via * complain() method for final summary output. @@ -188,8 +172,6 @@ public class Log extends FinalizableObject { */ @Deprecated protected Log() { - // install finalizer to print errors summary at exit - registerCleanup(); // Don't log exceptions from this method. It would just add unnecessary logs. loggedExceptions.add("nsk.share.jdi.SerialExecutionDebugger.executeTests"); } @@ -234,34 +216,6 @@ public class Log extends FinalizableObject { return verbose; } - /** - * Return true if printing errors summary at exit is enabled. - */ - public boolean isErrorsSummaryEnabled() { - return errorsSummaryEnabled; - } - - /** - * Enable or disable printing errors summary at exit. - */ - public void enableErrorsSummary(boolean enable) { - errorsSummaryEnabled = enable; - } - - /** - * Return true if printing saved verbose messages on error is enabled. - */ - public boolean isVerboseOnErrorEnabled() { - return errorsSummaryEnabled; - } - - /** - * Enable or disable printing saved verbose messages on error. - */ - public void enableVerboseOnError(boolean enable) { - verboseOnErrorEnabled = enable; - } - /** * Enable or disable verbose mode for printing messages. */ @@ -315,7 +269,7 @@ public class Log extends FinalizableObject { @Deprecated public synchronized void println(String message) { doPrint(message); - if (!verbose() && isVerboseOnErrorEnabled()) { + if (!verbose()) { keepLog(composeLine(message)); } } @@ -371,10 +325,8 @@ public class Log extends FinalizableObject { public synchronized void display(Object message) { if (verbose()) { doPrint(message.toString()); - } else if (isVerboseOnErrorEnabled()) { - keepLog(composeLine(message.toString())); } else { - // ignore + keepLog(composeLine(message.toString())); } } @@ -384,7 +336,7 @@ public class Log extends FinalizableObject { * into errorsBuffer. */ public synchronized void complain(Object message) { - if (!verbose() && isVerboseOnErrorEnabled()) { + if (!verbose()) { PrintStream stream = findOutStream(); stream.println("#> "); stream.println("#> WARNING: switching log to verbose mode,"); @@ -395,9 +347,6 @@ public class Log extends FinalizableObject { } String msgStr = message.toString(); printError(msgStr); - if (isErrorsSummaryEnabled()) { - keepError(msgStr); - } logExceptionForFailureAnalysis(msgStr); } @@ -469,7 +418,9 @@ public class Log extends FinalizableObject { */ @Deprecated protected synchronized void logTo(PrintStream stream) { - cleanup(); // flush older log stream + if (out != null) { + out.flush(); + } out = stream; verbose = true; } @@ -573,59 +524,6 @@ public class Log extends FinalizableObject { logBuffer.addElement(message); } - /** - * Keep the given error message into errorsBuffer. - */ - private synchronized void keepError(String message) { - errorsBuffer.addElement(message); - } - - /** - * Print errors messages summary from errors buffer if any; - * print a warning message first. - */ - private synchronized void printErrorsSummary() { - if (errorsBuffer.size() <= 0) - return; - - PrintStream stream = findOutStream(); - stream.println(); - stream.println(); - stream.println("#> "); - stream.println("#> SUMMARY: Following errors occured"); - stream.println("#> during test execution:"); - stream.println("#> "); - stream.flush(); - - for (Enumeration e = errorsBuffer.elements(); e.hasMoreElements(); ) { - printError((String) e.nextElement()); - } - } - - /** - * Print errors summary if mode is verbose, flush and cancel output stream. - * - * This is replacement of the finalize() method and is called when this - * Log instance becomes unreachable. - * - */ - @Override - public void cleanup() { - if (verbose() && isErrorsSummaryEnabled()) { - printErrorsSummary(); - } - if (out != null) - out.flush(); - out = null; - } - - /** - * Perform finalization at the exit. - */ - public void finalizeAtExit() { - cleanup(); - } - /** * This class can be used as a base for each class that use Log * for print messages and errors. diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java index 2fc76a991d5..bd57206302b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -147,8 +147,6 @@ public class BindServer implements Finalizable { } log = new Log(out, argHandler); - log.enableErrorsSummary(false); - log.enableVerboseOnError(false); logger = new Log.Logger(log, ""); registerCleanup(); diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java index 581f8a90571..2c219309b63 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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 @@ -235,7 +235,6 @@ public class MlvmTestExecutor { * @see #runMlvmTest(Class testClass, Object[] constructorArgs) */ public static void launch(Class testClass, Object[] constructorArgs) { - Env.getLog().enableVerboseOnError(true); long startTime = System.currentTimeMillis(); boolean passed;