Mercurial > hg > jdk9-shenandoah > langtools
changeset 2935:77166467f990
8080897: tests broken in bad merge
Reviewed-by: darcy
author | jjg |
---|---|
date | Thu, 21 May 2015 13:47:05 -0700 |
parents | 49d207bf704d |
children | 1391795f35fe |
files | test/tools/javac/proprietary/WarnClass.out test/tools/javac/proprietary/WarnMethod.out test/tools/javac/proprietary/WarnVariable.out test/tools/javac/proprietary/WarnWildcard.out |
diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/test/tools/javac/proprietary/WarnClass.out Thu May 21 11:41:04 2015 -0700 +++ b/test/tools/javac/proprietary/WarnClass.out Thu May 21 13:47:05 2015 -0700 @@ -1,4 +1,4 @@ -WarnClass.java:12:40: compiler.warn.sun.proprietary: sun.misc.Lock +WarnClass.java:13:40: compiler.warn.sun.proprietary: sun.misc.Lock - compiler.err.warnings.and.werror 1 error 1 warning
--- a/test/tools/javac/proprietary/WarnMethod.out Thu May 21 11:41:04 2015 -0700 +++ b/test/tools/javac/proprietary/WarnMethod.out Thu May 21 13:47:05 2015 -0700 @@ -1,4 +1,4 @@ -WarnMethod.java:14:36: compiler.warn.sun.proprietary: sun.misc.VM +WarnMethod.java:15:36: compiler.warn.sun.proprietary: sun.misc.VM - compiler.err.warnings.and.werror 1 error 1 warning
--- a/test/tools/javac/proprietary/WarnVariable.out Thu May 21 11:41:04 2015 -0700 +++ b/test/tools/javac/proprietary/WarnVariable.out Thu May 21 13:47:05 2015 -0700 @@ -1,4 +1,4 @@ -WarnVariable.java:14:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts +WarnVariable.java:15:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts - compiler.err.warnings.and.werror 1 error 1 warning
--- a/test/tools/javac/proprietary/WarnWildcard.out Thu May 21 11:41:04 2015 -0700 +++ b/test/tools/javac/proprietary/WarnWildcard.out Thu May 21 13:47:05 2015 -0700 @@ -1,4 +1,4 @@ -WarnWildcard.java:13:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts +WarnWildcard.java:14:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts - compiler.err.warnings.and.werror 1 error 1 warning