Automatic merge of jdk:master into master

Author: duke

test/hotspot/jtreg/gtest/GTestWrapper.java

@@ -118,8 +118,10 @@ private static String getJVMVariantSubDir() {
             return "client";
         } else if (Platform.isMinimal()) {
             return "minimal";
+        } else if (Platform.isZero()) {
+            return "zero";
         } else {
-            throw new Error("TESTBUG: unsuppported vm variant");
+            throw new Error("TESTBUG: unsupported vm variant");
         }
     }
 }