# HG changeset patch
# User coleenp
# Date 1513106046 18000
# Node ID a576e1b6784d17e8273a414c750ad814fcef28ae
# Parent  7daebcef2e0d0858b283a70ff4c9ca9c178476d2# Parent  ed1bb7743b3e3f37029fb60d10f9f228c84ade55
Merge

diff -r 7daebcef2e0d -r a576e1b6784d test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java
--- a/test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java	Tue Dec 12 11:55:57 2017 -0500
+++ b/test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java	Tue Dec 12 14:14:06 2017 -0500
@@ -27,7 +27,8 @@
  * @modules java.base/jdk.internal.misc:+open
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
+ *                   -Xbootclasspath/a:. -XX:+WhiteBoxAPI
  *                   -Xbatch -XX:-TieredCompilation -XX:+AlwaysIncrementalInline
  *                   -XX:CompileCommand=compileonly,compiler.ciReplay.TestDumpReplay::*
  *                   compiler.ciReplay.TestDumpReplay