--- old/test/jdk/tools/launcher/ExecutionEnvironment.java	2018-09-12 15:03:11.647403019 -0700
+++ new/test/jdk/tools/launcher/ExecutionEnvironment.java	2018-09-12 15:03:11.299412038 -0700
@@ -37,7 +37,8 @@
  *   1. uneccessary execs do not occur
  *   2. the environment is pristine,  users environment variable wrt.
  *      LD_LIBRARY_PATH if set are not modified in any way.
- *   3. the correct vm is chosen with -server and -client options
+ *   3. the correct vm is chosen with -server/--server and -client/--client
+ *      options
  *   4. the VM on Solaris correctly interprets the LD_LIBRARY_PATH32
  *      and LD_LIBRARY_PATH64 variables if set by the user, ie.
  *      i. on 32 bit systems:
@@ -258,9 +259,11 @@
     }
 
     private void tryVmOption(String opt, String expected) {
-        TestResult tr = doExec(javaCmd, opt, "-version");
-        if (!tr.matches(expected)) {
-            flagError(tr, "the expected vm " + opt + " did not launch");
+        for (String o : new String[] { opt, "-" + opt }) {
+            TestResult tr = doExec(javaCmd, o, "-version");
+            if (!tr.matches(expected)) {
+                flagError(tr, "the expected vm " + o + " did not launch");
+            }
         }
     }