author | lana |
Thu, 04 May 2017 00:02:23 +0000 | |
changeset 44892 | ec794e820a8e |
parent 41705 | 332239c052cc |
permissions | -rw-r--r-- |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
1 |
/* |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
4 |
* |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
8 |
* |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
41705
332239c052cc
8165687: Fix license and copyright headers in jd9 under hotspot/test
stsmirno
parents:
40631
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
13 |
* accompanied this code). |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
14 |
* |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
18 |
* |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
21 |
* questions. |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
22 |
*/ |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
23 |
|
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
24 |
/* |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
25 |
* @test |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
26 |
* @bug 8150083 |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
27 |
* @summary verification=info output should have output from the code |
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
37298
diff
changeset
|
28 |
* @library /test/lib |
37298
8df0cc9da41e
8154028: Several hotspot tests need to be updated after 8153737 (Unsupported Module)
amurillo
parents:
37261
diff
changeset
|
29 |
* @modules java.base/jdk.internal.misc |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
30 |
* java.management |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
31 |
* @run driver VerificationTest |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
32 |
*/ |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
33 |
|
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
37298
diff
changeset
|
34 |
import jdk.test.lib.process.OutputAnalyzer; |
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
37298
diff
changeset
|
35 |
import jdk.test.lib.process.ProcessTools; |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
36 |
|
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
37 |
public class VerificationTest { |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
38 |
static void analyzeOutputOn(ProcessBuilder pb) throws Exception { |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
39 |
OutputAnalyzer output = new OutputAnalyzer(pb.start()); |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
40 |
output.shouldContain("[verification]"); |
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
41 |
output.shouldContain("Verifying class VerificationTest$InternalClass with new format"); |
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
42 |
output.shouldContain("Verifying method VerificationTest$InternalClass.<init>()V"); |
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
43 |
output.shouldContain("End class verification for: VerificationTest$InternalClass"); |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
44 |
output.shouldHaveExitValue(0); |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
45 |
} |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
46 |
|
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
47 |
static void analyzeOutputOff(ProcessBuilder pb) throws Exception { |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
48 |
OutputAnalyzer output = new OutputAnalyzer(pb.start()); |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
49 |
output.shouldNotContain("[verification]"); |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
50 |
output.shouldHaveExitValue(0); |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
51 |
} |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
52 |
|
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
53 |
public static void main(String[] args) throws Exception { |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
54 |
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:verification=info", |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
55 |
InternalClass.class.getName()); |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
56 |
analyzeOutputOn(pb); |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
57 |
|
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
58 |
pb = ProcessTools.createJavaProcessBuilder("-Xlog:verification=off", |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
59 |
InternalClass.class.getName()); |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
60 |
analyzeOutputOff(pb); |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
61 |
} |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
62 |
|
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
63 |
public static class InternalClass { |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
64 |
public static void main(String[] args) throws Exception { |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37044
diff
changeset
|
65 |
System.out.println("VerificationTest"); |
37044
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
66 |
} |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
67 |
} |
f1965d5d1055
8150083: Convert VerboseVerification to Unified Logging
rprotacio
parents:
diff
changeset
|
68 |
} |