8332112: Update nsk.share.Log to don't print summary during VM shutdown hook
Reviewed-by: dholmes, cjplummer
This commit is contained in:
parent
30bb066b19
commit
61aff6db15
test/hotspot/jtreg/vmTestbase
nsk
jdi
PlugConnectors
AttachConnector
plugAttachConnect001
plugAttachConnect002
plugAttachConnect003
LaunchConnector
plugLaunchConnect001
plugLaunchConnect002
plugLaunchConnect003
ListenConnector
plugListenConnect001
plugListenConnect002
plugListenConnect003
MultiConnectors
plugMultiConnect001
plugMultiConnect002
plugMultiConnect003
plugMultiConnect004
plugMultiConnect005
plugMultiConnect006
TransportService
transportService001
transportService002
transportService003
ReferenceType/genericSignature
TypeComponent/genericSignature
VirtualMachineManager/createVirtualMachine
share
vm/mlvm/share
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
|
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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!");
|
||||
|
@ -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
|
||||
|
@ -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!");
|
||||
|
@ -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
|
||||
|
@ -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!");
|
||||
|
@ -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
|
||||
|
@ -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!");
|
||||
|
@ -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
|
||||
|
@ -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 <code>display()</code> 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
|
||||
* <code>printErrorsSummary()</code>.
|
||||
* <p>
|
||||
* To provide printing messages from different sources into one log
|
||||
* with distinct prefixes use internal <code>Log.Logger</code> 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 <code>true</code>;
|
||||
*/
|
||||
private boolean errorsSummaryEnabled = true;
|
||||
|
||||
/**
|
||||
* Is printing saved verbose messages on error enabled? Default value is <code>true</code>;
|
||||
*/
|
||||
private boolean verboseOnErrorEnabled = true;
|
||||
|
||||
/**
|
||||
* This <code>errosBuffer</code> will keep all messages printed via
|
||||
* <code>complain()</code> 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 <i>true</i> 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 <i>true</i> 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 <code>errorsBuffer</code>.
|
||||
*/
|
||||
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 <code>message</code> into <code>errorsBuffer</code>.
|
||||
*/
|
||||
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 <code>Log</code>
|
||||
* for print messages and errors.
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user