Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/tools/javac/newlines/NewLineTest.java	Thu Mar 14 01:45:44 2013 -0400
     1.2 +++ b/test/tools/javac/newlines/NewLineTest.java	Thu Mar 14 08:30:16 2013 +0000
     1.3 @@ -34,19 +34,18 @@
     1.4  import java.nio.charset.Charset;
     1.5  import java.nio.file.Files;
     1.6  import java.util.List;
     1.7 -import com.sun.tools.javac.util.ArrayUtils;
     1.8  
     1.9  //original test: test/tools/javac/newlines/Newlines.sh
    1.10  public class NewLineTest {
    1.11  
    1.12      public static void main(String args[]) throws Exception {
    1.13 -        String[] mainArgs = ToolBox.getJavacBin();
    1.14 -
    1.15  //        "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -J-Dline.separator='@' > ${TMP1} 2>&1
    1.16          File javacErrOutput = new File("output.txt");
    1.17          ToolBox.AnyToolArgs cmdArgs =
    1.18                  new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
    1.19 -                .setAllArgs(ArrayUtils.concatOpen(mainArgs, "-J-Dline.separator='@'"))
    1.20 +                .appendArgs(ToolBox.javacBinary)
    1.21 +                .appendArgs(ToolBox.testToolVMOpts)
    1.22 +                .appendArgs("-J-Dline.separator='@'")
    1.23                  .setErrOutput(javacErrOutput);
    1.24          ToolBox.executeCommand(cmdArgs);
    1.25