diff -r 000000000000 -r 9a66ca7c79fa test/tools/javac/Paths/Help.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/Paths/Help.sh	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+#
+# Copyright 2003 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#
+# @test
+# @bug 4940642
+# @summary Check for -help and -X flags
+# @author Martin Buchholz
+#
+# @run shell Help.sh
+
+# To run this test manually, simply do ./MineField.sh
+
+
+. ${TESTSRC-.}/Util.sh
+
+set -u
+
+DiagnosticsInEnglishPlease
+
+HELP="`$javac ${TESTTOOLVMOPTS} -help 2>&1`"
+XHELP="`$javac ${TESTTOOLVMOPTS} -X 2>&1`"
+
+#----------------------------------------------------------------
+# Standard options
+#----------------------------------------------------------------
+for opt in \
+    "-X " \
+    "-J" \
+    "-classpath " \
+    "-cp " \
+    "-bootclasspath " \
+    "-sourcepath "; 
+do
+    case "$HELP" in *"$opt"*) ;; *) Fail "Bad help output" ;; esac
+done
+
+#----------------------------------------------------------------
+# Non-standard options
+#----------------------------------------------------------------
+for opt in \
+    "-Xbootclasspath/p:"; 
+do
+    case "$XHELP" in *"$opt"*) ;; *) Fail "Bad help output" ;; esac
+done
+
+Bottom Line