8005647: langtools/test/tools/javap/MethodParameters.java fails on windows

Mon, 07 Jan 2013 17:51:05 +0000

author
jjh
date
Mon, 07 Jan 2013 17:51:05 +0000
changeset 1478
a9cb93cca229
parent 1477
8c0c63a6e3b7
child 1479
38d3d1027f5a

8005647: langtools/test/tools/javap/MethodParameters.java fails on windows
Summary: Fix javap to not output \r\r\n
Reviewed-by: jjg

src/share/classes/com/sun/tools/javap/ClassWriter.java file | annotate | diff | comparison | revisions
test/tools/javac/MethodParameters.java file | annotate | diff | comparison | revisions
test/tools/javap/MethodParameters.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/javap/ClassWriter.java	Sat Jan 05 00:55:53 2013 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javap/ClassWriter.java	Mon Jan 07 17:51:05 2013 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -206,7 +206,7 @@
    1.11              println("minor version: " + cf.minor_version);
    1.12              println("major version: " + cf.major_version);
    1.13              if (!options.compat)
    1.14 -              writeList("flags: ", flags.getClassFlags(), NEWLINE);
    1.15 +              writeList("flags: ", flags.getClassFlags(), "\n");
    1.16              indent(-1);
    1.17              constantWriter.writeConstantPool();
    1.18          } else {
    1.19 @@ -383,7 +383,7 @@
    1.20              println("Signature: " + getValue(f.descriptor));
    1.21  
    1.22          if (options.verbose && !options.compat)
    1.23 -            writeList("flags: ", flags.getFieldFlags(), NEWLINE);
    1.24 +            writeList("flags: ", flags.getFieldFlags(), "\n");
    1.25  
    1.26          if (options.showAllAttrs) {
    1.27              for (Attribute attr: f.attributes)
    1.28 @@ -480,7 +480,7 @@
    1.29          }
    1.30  
    1.31          if (options.verbose && !options.compat) {
    1.32 -            writeList("flags: ", flags.getMethodFlags(), NEWLINE);
    1.33 +            writeList("flags: ", flags.getMethodFlags(), "\n");
    1.34          }
    1.35  
    1.36          Code_attribute code = null;
    1.37 @@ -749,5 +749,4 @@
    1.38      private int size;
    1.39      private ConstantPool constant_pool;
    1.40      private Method method;
    1.41 -    private static final String NEWLINE = System.getProperty("line.separator", "\n");
    1.42  }
     2.1 --- a/test/tools/javac/MethodParameters.java	Sat Jan 05 00:55:53 2013 -0800
     2.2 +++ b/test/tools/javac/MethodParameters.java	Mon Jan 07 17:51:05 2013 +0000
     2.3 @@ -23,6 +23,7 @@
     2.4  
     2.5  /*
     2.6   * @test
     2.7 + * @bug 8004727
     2.8   * @summary javac should generate method parameters correctly.
     2.9   */
    2.10  // key: opt.arg.parameters
     3.1 --- a/test/tools/javap/MethodParameters.java	Sat Jan 05 00:55:53 2013 -0800
     3.2 +++ b/test/tools/javap/MethodParameters.java	Mon Jan 07 17:51:05 2013 +0000
     3.3 @@ -23,6 +23,7 @@
     3.4  
     3.5  /*
     3.6   * @test
     3.7 + * @bug 8004727 8005647
     3.8   * @summary javac should generate method parameters correctly.
     3.9   */
    3.10  

mercurial