equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
76 } else { |
76 } else { |
77 jarPathUpper = Paths.get(appJarUpper); |
77 jarPathUpper = Paths.get(appJarUpper); |
78 } |
78 } |
79 boolean isSameFile = Files.isSameFile(jarPath, jarPathUpper); |
79 boolean isSameFile = Files.isSameFile(jarPath, jarPathUpper); |
80 |
80 |
81 TestCommon.run("-cp", appJarUpper, "Hello", "-Xlog:class+path=info", |
81 TestCommon.run("-Xlog:class+path=info,cds", "-cp", appJarUpper, "Hello") |
82 "-Xlog:cds") |
|
83 .ifNoMappingFailure(output -> { |
82 .ifNoMappingFailure(output -> { |
84 if (isSameFile) { |
83 if (isSameFile) { |
85 output.shouldContain("Hello World"); |
84 output.shouldContain("Hello World"); |
86 } else { |
85 } else { |
87 output.shouldContain("shared class paths mismatch"); |
86 output.shouldContain("shared class paths mismatch"); |