Skip to content
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Jun 10, 2021
2 parents a5cebe8 + 964118f commit cb650bd2395ff0d931f0178ee11dc7e5e1cd26ca
Showing 5 changed files with 11 additions and 6 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -24,6 +24,7 @@
/*
* @test TestBasicLogOutput
* @summary Ensure logging can be enabled and successfully prints to stdout.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @run driver TestBasicLogOutput
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@@ -24,6 +24,7 @@
/*
* @test TestDefaultLogOutput
* @summary Ensure logging is default on stdout.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @run driver TestDefaultLogOutput
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2021, 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
@@ -23,8 +23,9 @@

/*
* @test TestFullNames
* @summary Ensure proper parsing of unquoted full output names for -Xlog arguments.
* @bug 8215398
* @summary Ensure proper parsing of unquoted full output names for -Xlog arguments.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @run driver TestFullNames
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -24,6 +24,7 @@
/*
* @test TestMultipleXlogArgs
* @summary Ensure multiple -Xlog arguments aggregate the logging options.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @run driver TestMultipleXlogArgs
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -24,6 +24,7 @@
/*
* @test TestQuotedLogOutputs
* @summary Ensure proper parsing of quoted output names for -Xlog arguments.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @comment after JDK-8224505, this has to be run in othervm mode

0 comments on commit cb650bd

Please sign in to comment.