Skip to content
Permalink
Browse files
8266169: mark hotspot compiler/jvmci tests which ignore VM flags
Reviewed-by: kvn
  • Loading branch information
iignatev committed Apr 28, 2021
1 parent 1a2a570 commit 69ad8ac537419caba72b369d1e3fb5f575e55061
Showing 4 changed files with 15 additions and 14 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2021, 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
@@ -25,6 +25,7 @@
* @test
* @bug 8235539 8245717
* @summary Tests effect of -XX:+EnableJVMCIProduct on EnableJVMCI and UseJVMCICompiler
* @requires vm.flagless
* @requires vm.jvmci
* @library /test/lib
* @run driver TestEnableJVMCIProduct
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, 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
@@ -25,11 +25,13 @@
* @test TestInvalidJVMCIOption
* @bug 8257220
* @summary Ensures invalid JVMCI options do not crash the VM with a hs-err log.
* @requires vm.jvmci & vm.compMode == "Xmixed"
* @requires vm.flagless
* @requires vm.jvmci
* @library /test/lib
* @run driver TestInvalidJVMCIOption
*/

import jdk.test.lib.Asserts;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;

@@ -45,13 +47,10 @@ public static void main(String[] args) throws Exception {
String expectStdout = String.format(
"Error parsing JVMCI options: Could not find option jvmci.XXXXXXXXX%n" +
"Error: A fatal exception has occurred. Program will exit.%n");
String actualStdout = output.getStdout();
if (!actualStdout.equals(expectStdout)) {
throw new RuntimeException(String.format("Invalid STDOUT:%nExpect:%n%s%nActual:%n%s", expectStdout, actualStdout));
}
if (!output.getStderr().isEmpty()) {
throw new RuntimeException("STDERR was not empty: " + output.getStderr());
}

Asserts.assertEQ(expectStdout, output.getStdout());
output.stderrShouldBeEmpty();

output.shouldHaveExitValue(1);
}
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -25,7 +25,8 @@
* @test TestBasicLogOutput
* @bug 8203370
* @summary Ensure -XX:-JVMCIPrintProperties can be enabled and successfully prints expected output to stdout.
* @requires vm.jvmci & !vm.graal.enabled & vm.compMode == "Xmixed"
* @requires vm.flagless
* @requires vm.jvmci
* @library /test/lib
* @run driver TestJVMCIPrintProperties
*/
@@ -24,10 +24,10 @@
/**
* @test
* @bug 8241232
* @requires vm.flagless
* @requires vm.jvmci
* @library /test/lib
* @build TestInvalidTieredStopAtLevel jdk.test.lib.process.*
* @run main TestInvalidTieredStopAtLevel
* @run driver TestInvalidTieredStopAtLevel
*/

import jdk.test.lib.process.ProcessTools;

1 comment on commit 69ad8ac

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 69ad8ac Apr 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.