--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/launcher/Settings.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.io.File;
+import java.io.IOException;
+
+/*
+ * @test
+ * @bug 6994753 7123582
+ * @summary tests -XshowSettings options
+ * @modules jdk.compiler
+ *          jdk.zipfs
+ * @compile -XDignore.symbol.file Settings.java
+ * @run main Settings
+ * @author ksrini
+ */
+public class Settings extends TestHelper {
+    private static File testJar = null;
+
+    static void init() throws IOException {
+        if  (testJar != null) {
+            return;
+        }
+        testJar = new File("test.jar");
+        StringBuilder tsrc = new StringBuilder();
+        tsrc.append("public static void main(String... args) {\n");
+        tsrc.append("   for (String x : args) {\n");
+        tsrc.append("        System.out.println(x);\n");
+        tsrc.append("   }\n");
+        tsrc.append("}\n");
+        createJar(testJar, tsrc.toString());
+    }
+
+    static void checkContains(TestResult tr, String str) {
+        if (!tr.contains(str)) {
+            System.out.println(tr);
+            throw new RuntimeException(str + " not found");
+        }
+    }
+
+    static void checkNotContains(TestResult tr, String str) {
+        if (!tr.notContains(str)) {
+            System.out.println(tr);
+            throw new RuntimeException(str + " found");
+        }
+    }
+
+    private static final String VM_SETTINGS = "VM settings:";
+    private static final String PROP_SETTINGS = "Property settings:";
+    private static final String LOCALE_SETTINGS = "Locale settings:";
+
+    static void containsAllOptions(TestResult tr) {
+        checkContains(tr, VM_SETTINGS);
+        checkContains(tr, PROP_SETTINGS);
+        checkContains(tr, LOCALE_SETTINGS);
+    }
+
+    static void runTestOptionDefault() throws IOException {
+        int stackSize = 256; // in kb
+        if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
+            stackSize = 800;
+        }
+        TestResult tr;
+        tr = doExec(javaCmd, "-Xms64m", "-Xmx512m",
+                "-Xss" + stackSize + "k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+        containsAllOptions(tr);
+        if (!tr.isOK()) {
+            System.out.println(tr);
+            throw new RuntimeException("test fails");
+        }
+        tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m",
+                "-Xss" + (stackSize * 1024), "-XshowSettings", "-jar", testJar.getAbsolutePath());
+        containsAllOptions(tr);
+        if (!tr.isOK()) {
+            System.out.println(tr);
+            throw new RuntimeException("test fails");
+        }
+    }
+
+    static void runTestOptionAll() throws IOException {
+        init();
+        TestResult tr = doExec(javaCmd, "-XshowSettings:all");
+        containsAllOptions(tr);
+    }
+
+    static void runTestOptionVM() throws IOException {
+        TestResult tr = doExec(javaCmd, "-XshowSettings:vm");
+        checkContains(tr, VM_SETTINGS);
+        checkNotContains(tr, PROP_SETTINGS);
+        checkNotContains(tr, LOCALE_SETTINGS);
+    }
+
+    static void runTestOptionProperty() throws IOException {
+        TestResult tr = doExec(javaCmd, "-XshowSettings:properties");
+        checkNotContains(tr, VM_SETTINGS);
+        checkContains(tr, PROP_SETTINGS);
+        checkNotContains(tr, LOCALE_SETTINGS);
+    }
+
+    static void runTestOptionLocale() throws IOException {
+        TestResult tr = doExec(javaCmd, "-XshowSettings:locale");
+        checkNotContains(tr, VM_SETTINGS);
+        checkNotContains(tr, PROP_SETTINGS);
+        checkContains(tr, LOCALE_SETTINGS);
+    }
+
+    static void runTestBadOptions() throws IOException {
+        TestResult tr = doExec(javaCmd, "-XshowSettingsBadOption");
+        checkNotContains(tr, VM_SETTINGS);
+        checkNotContains(tr, PROP_SETTINGS);
+        checkNotContains(tr, LOCALE_SETTINGS);
+        checkContains(tr, "Unrecognized option: -XshowSettingsBadOption");
+    }
+
+    static void runTest7123582() throws IOException {
+        TestResult tr = doExec(javaCmd, "-XshowSettings", "-version");
+        if (!tr.isOK()) {
+            System.out.println(tr);
+            throw new RuntimeException("test fails");
+        }
+        containsAllOptions(tr);
+    }
+
+    public static void main(String... args) throws IOException {
+        runTestOptionAll();
+        runTestOptionDefault();
+        runTestOptionVM();
+        runTestOptionProperty();
+        runTestOptionLocale();
+        runTestBadOptions();
+        runTest7123582();
+        if (testExitValue != 0) {
+            throw new Error(testExitValue + " tests failed");
+        }
+    }
+}