jdk-sandbox: comparison src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 /*
-* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2019, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 */
 package org.graalvm.compiler.hotspot.test;
+import static org.graalvm.compiler.test.SubprocessUtil.getPackageOpeningOptions;
 import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine;
 import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 /**
 * Tests support for dumping graphs and other info useful for debugging a compiler crash.
 */
 public class CompilationWrapperTest extends GraalCompilerTest {
+private static List<String> join(List<String> l1, List<String> l2) {
+ArrayList<String> result = new ArrayList<>(l1.size() + l2.size());
+result.addAll(l1);
+result.addAll(l2);
+return result;
+}
 /**
 * Tests compilation requested by the VM.
 */
 @Test
 */
 @Test
 public void testTruffleCompilation1() throws IOException, InterruptedException {
 assumeManagementLibraryIsLoadable();
 testHelper(Collections.emptyList(),
-Arrays.asList(
+join(getPackageOpeningOptions(),
-"-Dgraal.CompilationFailureAction=ExitVM",
+Arrays.asList(
-"-Dgraal.TrufflePerformanceWarningsAreFatal=true",
+"-Dgraal.CompilationFailureAction=ExitVM",
-"-Dgraal.CrashAt=root test1"),
+"-Dgraal.TrufflePerformanceWarningsAreFatal=true",
+"-Dgraal.CrashAt=root test1")),
 "org.graalvm.compiler.truffle.test.SLTruffleGraalTestSuite", "test");
 }
 /**
 * Tests that TruffleCompilationExceptionsAreFatal works as expected.
 public void testTruffleCompilation2() throws IOException, InterruptedException {
 Probe[] probes = {
 new Probe("Exiting VM due to TruffleCompilationExceptionsAreFatal=true", 1),
 };
 testHelper(Arrays.asList(probes),
-Arrays.asList(
+join(getPackageOpeningOptions(),
-"-Dgraal.CompilationFailureAction=Silent",
+Arrays.asList(
-"-Dgraal.TruffleCompilationExceptionsAreFatal=true",
+"-Dgraal.CompilationFailureAction=Silent",
-"-Dgraal.CrashAt=root test1"),
+"-Dgraal.TruffleCompilationExceptionsAreFatal=true",
+"-Dgraal.CrashAt=root test1")),
 "org.graalvm.compiler.truffle.test.SLTruffleGraalTestSuite", "test");
 }
 /**
 * Tests that TrufflePerformanceWarningsAreFatal generates diagnostic output.
 assumeManagementLibraryIsLoadable();
 Probe[] probes = {
 new Probe("Exiting VM due to TrufflePerformanceWarningsAreFatal=true", 1),
 };
 testHelper(Arrays.asList(probes),
-Arrays.asList(
+join(getPackageOpeningOptions(),
-"-Dgraal.CompilationFailureAction=Silent",
+Arrays.asList(
-"-Dgraal.TrufflePerformanceWarningsAreFatal=true",
+"-Dgraal.CompilationFailureAction=Silent",
-"-Dgraal.CrashAt=root test1:PermanentBailout"),
+"-Dgraal.TrufflePerformanceWarningsAreFatal=true",
+"-Dgraal.CrashAt=root test1:PermanentBailout")),
 "org.graalvm.compiler.truffle.test.SLTruffleGraalTestSuite", "test");
 }
 private static final boolean VERBOSE = Boolean.getBoolean(CompilationWrapperTest.class.getSimpleName() + ".verbose");
 Subprocess proc = SubprocessUtil.java(vmArgs, mainClassAndArgs);
 if (VERBOSE) {
 System.out.println(proc);
 }
-List<Probe> probes = new ArrayList<>(initialProbes);
+try {
-Probe diagnosticProbe = null;
+List<Probe> probes = new ArrayList<>(initialProbes);
-if (!extraVmArgs.contains("-Dgraal.TruffleCompilationExceptionsAreFatal=true")) {
+Probe diagnosticProbe = new Probe("Graal diagnostic output saved in ", 1);
-diagnosticProbe = new Probe("Graal diagnostic output saved in ", 1);
 probes.add(diagnosticProbe);
 probes.add(new Probe("Forced crash after compiling", Integer.MAX_VALUE) {
 @Override
 String test() {
 return actualOccurrences > 0 ? null : "expected at least 1 occurrence";
 }
 });
-}
+for (String line : proc.output) {
-for (String line : proc.output) {
+for (Probe probe : probes) {
+if (probe.matches(line)) {
+break;
+}
+}
+}
 for (Probe probe : probes) {
-if (probe.matches(line)) {
+String error = probe.test();
-break;
+if (error != null) {
-}
+Assert.fail(String.format("Did not find expected occurences of '%s' in output of command: %s%n%s", probe.substring, error, proc));
 }
 }
-for (Probe probe : probes) {
-String error = probe.test();
-if (error != null) {
-Assert.fail(String.format("Did not find expected occurences of '%s' in output of command: %s%n%s", probe.substring, error, proc));
-}
-}
-if (diagnosticProbe != null) {
 String line = diagnosticProbe.lastMatchingLine;
 int substringStart = line.indexOf(diagnosticProbe.substring);
 int substringLength = diagnosticProbe.substring.length();
 String diagnosticOutputZip = line.substring(substringStart + substringLength).trim();
 if (bgvOrCfgFiles == 0) {
 Assert.fail(String.format("Expected at least one .bgv or .cfg file in %s: %s%n%s", diagnosticOutputZip, entries, proc));
 }
 } finally {
 zip.delete();
-dumpPath.delete();
+}
-}
+} finally {
+Path directory = dumpPath.toPath();
+removeDirectory(directory);
 }
 }
 }
 class TestProgram {

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 52910	583fd71c47d6
child 58679	9c3209ff7550