# HG changeset patch
# User dlong
# Date 1512501363 28800
# Node ID d18861f20c0e10b64d2cd76e7dc2e076f518d613
# Parent  0dc66cdf4720a63b36e57eea6bcbd35ef40431d8
8192870: [Testbug] runtime/handshake/HandshakeTransitionTest throws NPE
Reviewed-by: dholmes, rehn

diff -r 0dc66cdf4720 -r d18861f20c0e test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java	Tue Dec 05 10:38:31 2017 -0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java	Tue Dec 05 11:16:03 2017 -0800
@@ -49,6 +49,14 @@
     public static void main(String[] args) throws Exception {
         String lib = System.getProperty("test.nativepath");
         WhiteBox wb = WhiteBox.getWhiteBox();
+        Boolean useJVMCICompiler = wb.getBooleanVMFlag("UseJVMCICompiler");
+        String useJVMCICompilerStr;
+        if (useJVMCICompiler != null) {
+            useJVMCICompilerStr = useJVMCICompiler ?  "-XX:+UseJVMCICompiler" : "-XX:-UseJVMCICompiler";
+        } else {
+            // pass something innocuous
+            useJVMCICompilerStr = "-XX:+UnlockExperimentalVMOptions";
+        }
         ProcessBuilder pb =
             ProcessTools.createJavaProcessBuilder(
                     true,
@@ -60,7 +68,7 @@
                     "-XX:ConcGCThreads=1",
                     "-XX:CICompilerCount=2",
                     "-XX:+UnlockExperimentalVMOptions",
-                    (wb.getBooleanVMFlag("UseJVMCICompiler") ?  "-XX:+UseJVMCICompiler" : "-XX:-UseJVMCICompiler"),
+                    useJVMCICompilerStr,
                     "HandshakeTransitionTest$Test");