test/jdk/tools/launcher/Settings.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File open Cdiff test/jdk/tools/launcher/Settings.java

test/jdk/tools/launcher/Settings.java

Print this page

        

*** 65,79 **** --- 65,83 ---- } private static final String VM_SETTINGS = "VM settings:"; private static final String PROP_SETTINGS = "Property settings:"; private static final String LOCALE_SETTINGS = "Locale settings:"; + private static final String SYSTEM_SETTINGS = "Operating System Metrics:"; static void containsAllOptions(TestResult tr) { checkContains(tr, VM_SETTINGS); checkContains(tr, PROP_SETTINGS); checkContains(tr, LOCALE_SETTINGS); + if (System.getProperty("os.name").contains("Linux")) { + checkContains(tr, SYSTEM_SETTINGS); + } } static void runTestOptionDefault() throws IOException { int stackSize = 256; // in kb if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
*** 121,130 **** --- 125,148 ---- checkNotContains(tr, VM_SETTINGS); checkNotContains(tr, PROP_SETTINGS); checkContains(tr, LOCALE_SETTINGS); } + static void runTestOptionSystem() throws IOException { + TestResult tr = doExec(javaCmd, "-XshowSettings:system"); + if (System.getProperty("os.name").contains("Linux")) { + checkNotContains(tr, VM_SETTINGS); + checkNotContains(tr, PROP_SETTINGS); + checkNotContains(tr, LOCALE_SETTINGS); + checkContains(tr, SYSTEM_SETTINGS); + } else { + // -XshowSettings prints all available settings when + // settings argument is not recognized. + containsAllOptions(tr); + } + } + static void runTestBadOptions() throws IOException { TestResult tr = doExec(javaCmd, "-XshowSettingsBadOption"); checkNotContains(tr, VM_SETTINGS); checkNotContains(tr, PROP_SETTINGS); checkNotContains(tr, LOCALE_SETTINGS);
*** 144,153 **** --- 162,172 ---- runTestOptionAll(); runTestOptionDefault(); runTestOptionVM(); runTestOptionProperty(); runTestOptionLocale(); + runTestOptionSystem(); runTestBadOptions(); runTest7123582(); if (testExitValue != 0) { throw new Error(testExitValue + " tests failed"); }
test/jdk/tools/launcher/Settings.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File