Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Mon Jul 20 09:10:39 2015 -0700
     1.2 +++ b/.hgtags	Thu Jul 23 11:23:43 2015 -0700
     1.3 @@ -449,6 +449,7 @@
     1.4  d1febf79ce5ea41fb4b818ffd3589cf923e6de5f jdk8u60-b22
     1.5  7f88b5dc78cebc2c5ebb716938fd9a7632b052b2 jdk8u60-b23
     1.6  2af11e10da7dc24610551bbeed02c4ca3f4ae654 jdk8u60-b24
     1.7 +8d152d1e45944616309886e730ffcbfb5c078d22 jdk8u60-b25
     1.8  779397f90251ea813cb44621dc27f780e5c20449 jdk8u52-b06
     1.9  e0ce6be9142ed1e2f0ce3ee13090ec01c6c44721 jdk8u52-b07
    1.10  779397f90251ea813cb44621dc27f780e5c20449 jdk8u65-b00
    1.11 @@ -457,6 +458,7 @@
    1.12  0e03089b5bb37450c7bcab8fc9cb0912e24fe681 jdk8u65-b03
    1.13  b90367f392f5d7af47c26bae5493adc73a865c70 jdk8u65-b04
    1.14  b2e8d2c5636f5f98a10b9e800ea10e0fe4c265c3 jdk8u65-b05
    1.15 +ae5e31450299f6c265df24ed155acd650fb3bffd jdk8u65-b06
    1.16  d1febf79ce5ea41fb4b818ffd3589cf923e6de5f jdk8u66-b00
    1.17  4c13b9cd06222be73b9c44607ae929b4818aed17 jdk8u66-b01
    1.18  aaad025819b721f7f291048a07cd1c144319b68d jdk8u71-b00

     2.1 --- a/test/tools/javac/links/LinksTest.java	Mon Jul 20 09:10:39 2015 -0700
     2.2 +++ b/test/tools/javac/links/LinksTest.java	Thu Jul 23 11:23:43 2015 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -30,6 +30,7 @@
    2.11   * @run main LinksTest
    2.12   */
    2.13  
    2.14 +import java.io.IOException;
    2.15  import java.nio.file.Files;
    2.16  import java.nio.file.Paths;
    2.17  
    2.18 @@ -48,19 +49,26 @@
    2.19              throws Exception {
    2.20  //      mkdir tmp
    2.21  //      cp ${TESTSRC}/b/B.java tmp
    2.22 -        ToolBox.writeFile(Paths.get("tmp", "B.java"), BSrc);
    2.23 +        ToolBox.writeFile(Paths.get("tmp/B.java"), BSrc);
    2.24  
    2.25 +        // Try to set up a symbolic link for the test.
    2.26 +//        ln -s `pwd`/tmp "${TESTCLASSES}/a"
    2.27          try {
    2.28 -//        ln -s `pwd`/tmp "${TESTCLASSES}/a"
    2.29              Files.createSymbolicLink(Paths.get("a"), Paths.get("tmp"));
    2.30 -            ////"${TESTJAVA}/bin/javac" ${TESTTOOLVMOPTS} -sourcepath "${TESTCLASSES}" -d "${TESTCLASSES}/classes" "${TESTSRC}/T.java" 2>&1
    2.31 -            ToolBox.JavaToolArgs javacArgs =
    2.32 -                    new ToolBox.JavaToolArgs()
    2.33 -                    .setOptions("-sourcepath", ".", "-d", ".").setSources(TSrc);
    2.34 -            ToolBox.javac(javacArgs);
    2.35 -        } catch (UnsupportedOperationException e) {
    2.36 -            System.err.println("Symbolic links not supported on this system. The test can't finish");
    2.37 +            System.err.println("Created symbolic link");
    2.38 +        } catch (UnsupportedOperationException | IOException e) {
    2.39 +            System.err.println("Problem creating symbolic link: " + e);
    2.40 +            System.err.println("Test cannot continue; test passed by default");
    2.41 +            return;
    2.42          }
    2.43 +
    2.44 +        // If symbolic link was successfully created,
    2.45 +        // try a compilation that will use it.
    2.46 +        ////"${TESTJAVA}/bin/javac" ${TESTTOOLVMOPTS} -sourcepath "${TESTCLASSES}" -d "${TESTCLASSES}/classes" "${TESTSRC}/T.java" 2>&1
    2.47 +        ToolBox.JavaToolArgs javacArgs =
    2.48 +                new ToolBox.JavaToolArgs()
    2.49 +                .setOptions("-sourcepath", ".", "-d", ".").setSources(TSrc);
    2.50 +        ToolBox.javac(javacArgs);
    2.51      }
    2.52  
    2.53  }