equal
deleted
inserted
replaced
24 package compiler.aot; |
24 package compiler.aot; |
25 |
25 |
26 import jdk.test.lib.Platform; |
26 import jdk.test.lib.Platform; |
27 import jdk.test.lib.artifacts.Artifact; |
27 import jdk.test.lib.artifacts.Artifact; |
28 import jdk.test.lib.artifacts.ArtifactResolver; |
28 import jdk.test.lib.artifacts.ArtifactResolver; |
|
29 import jdk.test.lib.artifacts.ArtifactResolverException; |
29 import jdk.test.lib.process.OutputAnalyzer; |
30 import jdk.test.lib.process.OutputAnalyzer; |
30 import java.io.File; |
31 import java.io.File; |
31 import java.io.FileNotFoundException; |
|
32 import java.io.IOException; |
32 import java.io.IOException; |
33 import java.lang.annotation.Annotation; |
33 import java.lang.annotation.Annotation; |
34 import java.nio.file.Files; |
34 import java.nio.file.Files; |
35 import java.nio.file.Path; |
35 import java.nio.file.Path; |
36 import java.nio.file.Paths; |
36 import java.nio.file.Paths; |
296 .get(artifactName); |
296 .get(artifactName); |
297 linker = devkit.resolve("bin") |
297 linker = devkit.resolve("bin") |
298 .resolve("ld"); |
298 .resolve("ld"); |
299 } |
299 } |
300 } |
300 } |
301 } catch (FileNotFoundException e) { |
301 } catch (ArtifactResolverException e) { |
302 System.err.println("artifact resolution error: " + e); |
302 System.err.println("artifact resolution error: " + e); |
303 // let jaotc try to find linker |
303 // let jaotc try to find linker |
304 return null; |
304 return null; |
305 } |
305 } |
306 if (linker != null) { |
306 if (linker != null) { |