# HG changeset patch # User ctornqvi # Date 1429818402 25200 # Node ID 2ca5f3a28b0fd6c94817f7e520878051a78c7281 # Parent 6bc6bcda7c91079e877faf032a735373f652b398 8078435: [TESTBUG] runtime/CommandLine/TestVMOptions.java fails when running with an OpenJDK build Reviewed-by: mseledtsov, hseigel diff -r 6bc6bcda7c91 -r 2ca5f3a28b0f hotspot/test/runtime/CommandLine/TestVMOptions.java --- a/hotspot/test/runtime/CommandLine/TestVMOptions.java Thu Apr 23 17:42:06 2015 +0200 +++ b/hotspot/test/runtime/CommandLine/TestVMOptions.java Thu Apr 23 12:46:42 2015 -0700 @@ -46,7 +46,7 @@ pb = ProcessTools.createJavaProcessBuilder( "-XX:-PrintVMOptions", "-version"); output = new OutputAnalyzer(pb.start()); - output.shouldContain("java version"); + output.shouldMatch("(openjdk|java)\\sversion"); File dir = new File(System.getProperty("test.src", ".")); File file = new File(dir, "flagfile.txt");