Skip to content
Permalink
Browse files
8208227: tools/jdeps/DotFileTest.java fails on Win-X64
Backport-of: f0e9643
  • Loading branch information
RealCLanger committed Jul 28, 2021
1 parent 5c8a0b4 commit adcfbd2d8cdcc3ad5eb5bf605b1eddd599db68f1
Showing with 11 additions and 8 deletions.
  1. +11 −8 test/langtools/tools/jdeps/DotFileTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,8 @@
* @summary Basic tests for jdeps -dotoutput option
* @modules java.management
* jdk.jdeps/com.sun.tools.jdeps
* @build Test p.Foo p.Bar
* @library /tools/lib
* @build toolbox.ToolBox Test p.Foo p.Bar
* @run main DotFileTest
*/

@@ -43,6 +44,8 @@
import java.util.regex.*;
import java.util.stream.Collectors;

import toolbox.ToolBox;

public class DotFileTest {
public static void main(String... args) throws Exception {
int errors = 0;
@@ -51,9 +54,11 @@ public static void main(String... args) throws Exception {
throw new Exception(errors + " errors found");
}

final ToolBox toolBox;
final Path dir;
final Path dotoutput;
DotFileTest() {
this.toolBox = new ToolBox();
this.dir = Paths.get(System.getProperty("test.classes", "."));
this.dotoutput = dir.resolve("dots");
}
@@ -169,12 +174,10 @@ void testSummary(File file, String[] expect, String[] profiles, String[] options

Map<String,String> jdeps(List<String> args, Path dotfile) throws IOException {
if (Files.exists(dotoutput)) {
try (DirectoryStream<Path> stream = Files.newDirectoryStream(dotoutput)) {
for (Path p : stream) {
Files.delete(p);
}
}
Files.delete(dotoutput);
// delete contents of directory, then directory,
// waiting for confirmation on Windows
toolBox.cleanDirectory(dotoutput);
toolBox.deleteFiles(dotoutput);
}
// invoke jdeps
StringWriter sw = new StringWriter();

1 comment on commit adcfbd2

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on adcfbd2 Jul 28, 2021

Please sign in to comment.