--- old/make/Images.gmk 2017-12-19 13:43:25.805524816 -0800 +++ new/make/Images.gmk 2017-12-19 13:43:25.481510553 -0800 @@ -210,7 +210,6 @@ jarsigner.1 \ javac.1 \ javadoc.1 \ - javah.1 \ javap.1 \ jconsole.1 \ jcmd.1 \ --- old/make/RunTestsPrebuiltSpec.gmk 2017-12-19 13:43:26.545557391 -0800 +++ new/make/RunTestsPrebuiltSpec.gmk 2017-12-19 13:43:26.145539783 -0800 @@ -110,7 +110,6 @@ # Java executable definitions JAVA_CMD := $(BOOT_JDK)/bin/java JAVAC_CMD := $(BOOT_JDK)/bin/javac -JAVAH_CMD := $(BOOT_JDK)/bin/javah JAR_CMD := $(BOOT_JDK)/bin/jar JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod @@ -120,7 +119,6 @@ JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) JAVA_JAVAC := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) JAVAC := $(FIXPATH) $(JAVAC_CMD) -JAVAH := $(FIXPATH) $(JAVAH_CMD) JAR := $(FIXPATH) $(JAR_CMD) JLINK := $(FIXPATH) $(JLINK_CMD) JMOD := $(FIXPATH) $(JMOD_CMD) --- old/make/autoconf/boot-jdk.m4 2017-12-19 13:43:27.345592607 -0800 +++ new/make/autoconf/boot-jdk.m4 2017-12-19 13:43:26.929574294 -0800 @@ -295,7 +295,6 @@ # Setup tools from the Boot JDK. BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac) - BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH, javah) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner) --- old/make/autoconf/bootcycle-spec.gmk.in 2017-12-19 13:43:28.117626591 -0800 +++ new/make/autoconf/bootcycle-spec.gmk.in 2017-12-19 13:43:27.737609863 -0800 @@ -52,7 +52,6 @@ JAVA_CMD:=$(BOOT_JDK)/bin/java JAVAC_CMD:=$(BOOT_JDK)/bin/javac -JAVAH_CMD:=$(BOOT_JDK)/bin/javah JAR_CMD:=$(BOOT_JDK)/bin/jar JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD) --- old/make/autoconf/generated-configure.sh 2017-12-19 13:43:28.873659870 -0800 +++ new/make/autoconf/generated-configure.sh 2017-12-19 13:43:28.485642791 -0800 @@ -881,7 +881,6 @@ JARSIGNER JAR JAVADOC -JAVAH JAVAC JAVA BOOT_JDK @@ -1093,7 +1092,6 @@ docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1300,7 +1298,6 @@ PKG_CONFIG JAVA JAVAC -JAVAH JAVADOC JAR JARSIGNER @@ -1384,7 +1381,6 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1637,15 +1633,6 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1783,7 +1770,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1936,7 +1923,6 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2271,7 +2257,6 @@ PKG_CONFIG path to pkg-config utility JAVA Override default value for JAVA JAVAC Override default value for JAVAC - JAVAH Override default value for JAVAH JAVADOC Override default value for JAVADOC JAR Override default value for JAR JARSIGNER Override default value for JARSIGNER @@ -5187,7 +5172,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1513702260 +DATE_WHEN_GENERATED=1513717875 ############################################################################### # @@ -30912,144 +30897,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5 $as_echo "$tool_specified" >&6; } - fi - fi - fi - - fi - - - - # Use user overridden value if available, otherwise locate tool in the Boot JDK. - - # Publish this variable in the help. - - - if [ -z "${JAVAH+x}" ]; then - # The variable is not set by user, try to locate tool using the code snippet - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5 -$as_echo_n "checking for javah in Boot JDK... " >&6; } - JAVAH=$BOOT_JDK/bin/javah - if test ! -x $JAVAH; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5 -$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;} - as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - - - else - # The variable is set, but is it from the command line or the environment? - - # Try to remove the string !JAVAH! from our list. - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JAVAH!/} - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then - # If it failed, the variable was not from the command line. Ignore it, - # but warn the user (except for BASH, which is always set by the calling BASH). - if test "xJAVAH" != xBASH; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&5 -$as_echo "$as_me: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&2;} - fi - # Try to locate tool using the code snippet - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5 -$as_echo_n "checking for javah in Boot JDK... " >&6; } - JAVAH=$BOOT_JDK/bin/javah - if test ! -x $JAVAH; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5 -$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;} - as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - - - else - # If it succeeded, then it was overridden by the user. We will use it - # for the tool. - - # First remove it from the list of overridden variables, so we can test - # for unknown variables in the end. - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" - - # Check if we try to supply an empty value - if test "x$JAVAH" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Setting user supplied tool JAVAH= (no value)" >&5 -$as_echo "$as_me: Setting user supplied tool JAVAH= (no value)" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5 -$as_echo_n "checking for JAVAH... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } - else - # Check if the provided tool contains a complete path. - tool_specified="$JAVAH" - tool_basename="${tool_specified##*/}" - if test "x$tool_basename" = "x$tool_specified"; then - # A command without a complete path is provided, search $PATH. - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JAVAH=$tool_basename" >&5 -$as_echo "$as_me: Will search for user supplied tool JAVAH=$tool_basename" >&6;} - # Extract the first word of "$tool_basename", so it can be a program name with args. -set dummy $tool_basename; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_JAVAH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $JAVAH in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -JAVAH=$ac_cv_path_JAVAH -if test -n "$JAVAH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5 -$as_echo "$JAVAH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$JAVAH" = x; then - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5 - fi - else - # Otherwise we believe it is a complete path. Use it as it is. - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JAVAH=$tool_specified" >&5 -$as_echo "$as_me: Will use user supplied tool JAVAH=$tool_specified" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5 -$as_echo_n "checking for JAVAH... " >&6; } - if test ! -x "$tool_specified"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - as_fn_error $? "User supplied tool JAVAH=$tool_specified does not exist or is not executable" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5 -$as_echo "$tool_specified" >&6; } fi fi fi --- old/make/autoconf/spec.gmk.in 2017-12-19 13:43:30.441728894 -0800 +++ new/make/autoconf/spec.gmk.in 2017-12-19 13:43:30.061712166 -0800 @@ -540,7 +540,6 @@ # versions of the variables directly. JAVA_CMD:=@JAVA@ JAVAC_CMD:=@JAVAC@ -JAVAH_CMD:=@JAVAH@ JAVADOC_CMD:=@JAVADOC@ JAR_CMD:=@JAR@ JLINK_CMD := @JLINK@ @@ -553,7 +552,6 @@ JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS) JAVAC=@FIXPATH@ $(JAVAC_CMD) -JAVAH=@FIXPATH@ $(JAVAH_CMD) JAVADOC=@FIXPATH@ $(JAVADOC_CMD) JAR=@FIXPATH@ $(JAR_CMD) JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL) @@ -717,7 +715,7 @@ # Directories containing architecture-dependent files should be relative to exec_prefix INSTALL_EXECPREFIX=@exec_prefix@ -# java,javac,javah,javap etc are installed here. +# java,javac,javap etc are installed here. INSTALL_BINDIR=@bindir@ # Read only architecture-independent data --- old/make/common/JavaCompilation.gmk 2017-12-19 13:43:31.093757595 -0800 +++ new/make/common/JavaCompilation.gmk 2017-12-19 13:43:30.773743508 -0800 @@ -46,7 +46,7 @@ # passed to SetupJavaCompilation. This name is used as variable prefix. # # Remaining parameters are named arguments. These include: -# JVM:=The jvm used to run the javac/javah command +# JVM:=The jvm used to run the javac command # JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out # FLAGS:=Flags to be supplied to javac # SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here --- old/make/gensrc/Gensrc-jdk.compiler.gmk 2017-12-19 13:43:31.741786120 -0800 +++ new/make/gensrc/Gensrc-jdk.compiler.gmk 2017-12-19 13:43:31.425772210 -0800 @@ -28,11 +28,8 @@ $(eval $(call SetupVersionProperties,JAVAC_VERSION, \ com/sun/tools/javac/resources/version.properties)) -$(eval $(call SetupVersionProperties,JAVAH_VERSION, \ - com/sun/tools/javah/resources/version.properties)) - $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \ - $(JAVAC_VERSION) $(JAVAH_VERSION))) + $(JAVAC_VERSION))) $(eval $(call SetupParseProperties,PARSE_PROPERTIES, \ com/sun/tools/javac/resources/compiler.properties)) --- old/make/langtools/build.properties 2017-12-19 13:43:32.465817990 -0800 +++ new/make/langtools/build.properties 2017-12-19 13:43:32.057800030 -0800 @@ -60,7 +60,6 @@ tool.javac.main.class=com.sun.tools.javac.Main tool.javadoc.main.class=jdk.javadoc.internal.tool.Main tool.javap.main.class=com.sun.tools.javap.Main -tool.javah.main.class=com.sun.tools.javah.Main tool.sjavac.main.class=com.sun.tools.sjavac.Main tool.jshell.main.class=jdk.internal.jshell.tool.JShellToolProvider --- old/make/langtools/build.xml 2017-12-19 13:43:33.221851270 -0800 +++ new/make/langtools/build.xml 2017-12-19 13:43:32.837834366 -0800 @@ -41,7 +41,7 @@ The output of the build is as follows: build - |-bin (scripts to invoke various tools, javac, javah etc.) + |-bin (scripts to invoke various tools, javac etc.) |-genrsc (generated sources - i.e. properties) |-modules (compiled classes in a modular layout) |-jtreg (test work/results) @@ -254,7 +254,6 @@ - --- old/make/langtools/netbeans/README 2017-12-19 13:43:33.969884196 -0800 +++ new/make/langtools/netbeans/README 2017-12-19 13:43:33.553865885 -0800 @@ -7,7 +7,7 @@ repository. The repository contains a number of tools: - javac, javadoc and its doclets, javah and javap. + javac, javadoc and its doclets, and javap. Build Properties. --- old/make/langtools/test/HelloWorld.apt.gold.txt 2017-12-19 13:43:34.733917828 -0800 +++ new/make/langtools/test/HelloWorld.apt.gold.txt 2017-12-19 13:43:34.349900925 -0800 @@ -11,9 +11,4 @@ * @param args The parameters are ignored. */ public static void main(java.lang.String... args); - - /** - * This declaration is for the benefit of javah tests. - */ - public native void test(); } --- old/make/langtools/test/HelloWorld.java 2017-12-19 13:43:35.385946529 -0800 +++ new/make/langtools/test/HelloWorld.java 2017-12-19 13:43:35.053931914 -0800 @@ -37,9 +37,4 @@ public static void main(String... args) { System.out.println("Hello World!"); } - - /** - * This declaration is for the benefit of javah tests. - */ - public native void test(); } --- old/make/langtools/test/contents.gold.txt 2017-12-19 13:43:36.073976815 -0800 +++ new/make/langtools/test/contents.gold.txt 2017-12-19 13:43:35.741962200 -0800 @@ -1,9 +1,7 @@ ./bootstrap/bin/javac ./bootstrap/bin/javadoc -./bootstrap/bin/javah ./bootstrap/lib/doclets.jar ./bootstrap/lib/javac.jar ./bootstrap/lib/javadoc.jar -./bootstrap/lib/javah.jar ./lib/classes.jar ./lib/src.zip --- old/make/langtools/test/lib/classes.gold.txt 2017-12-19 13:43:36.842010623 -0800 +++ new/make/langtools/test/lib/classes.gold.txt 2017-12-19 13:43:36.437992838 -0800 @@ -1,9 +1,4 @@ META-INF/MANIFEST.MF -com/sun/tools/apt/Main.class -com/sun/tools/apt/main/Main.class -com/sun/tools/apt/resources/apt.class -com/sun/tools/apt/resources/apt_ja.class -com/sun/tools/apt/resources/apt_zh_CN.class com/sun/tools/doclets/formats/html/resources/standard.class com/sun/tools/doclets/formats/html/resources/standard_ja.class com/sun/tools/doclets/formats/html/resources/standard_zh_CN.class @@ -26,13 +21,3 @@ com/sun/tools/javadoc/resources/javadoc.class com/sun/tools/javadoc/resources/javadoc_ja.class com/sun/tools/javadoc/resources/javadoc_zh_CN.class -com/sun/tools/javah/Main.class -com/sun/tools/javah/resources/Linux_ppc.class -com/sun/tools/javah/resources/Linux_sparc.class -com/sun/tools/javah/resources/SunOS_sparc.class -com/sun/tools/javah/resources/SunOS_sparcv9.class -com/sun/tools/javah/resources/l10n.class -com/sun/tools/javah/resources/l10n_ja.class -com/sun/tools/javah/resources/l10n_zh_CN.class -com/sun/tools/javah/resources/win32_x86.class -sun/tools/javap/Main.class --- old/make/langtools/test/lib/src.gold.txt 2017-12-19 13:43:37.494039323 -0800 +++ new/make/langtools/test/lib/src.gold.txt 2017-12-19 13:43:37.174025237 -0800 @@ -29,15 +29,5 @@ com/sun/tools/javadoc/resources/javadoc.properties com/sun/tools/javadoc/resources/javadoc_ja.properties com/sun/tools/javadoc/resources/javadoc_zh_CN.properties -com/sun/tools/javah/Main.java -com/sun/tools/javah/resources/Linux_ppc.properties -com/sun/tools/javah/resources/Linux_sparc.properties -com/sun/tools/javah/resources/SunOS_sparc.properties -com/sun/tools/javah/resources/SunOS_sparcv9.properties -com/sun/tools/javah/resources/l10n.properties -com/sun/tools/javah/resources/l10n_ja.properties -com/sun/tools/javah/resources/l10n_zh_CN.properties -com/sun/tools/javah/resources/win32_x86.properties javax/lang/model/overview.html javax/tools/overview.html -sun/tools/javap/Main.java --- old/make/langtools/tools/anttasks/SelectToolTask.java 2017-12-19 13:43:38.130067320 -0800 +++ new/make/langtools/tools/anttasks/SelectToolTask.java 2017-12-19 13:43:37.810053234 -0800 @@ -76,7 +76,6 @@ NONE(""), JAVAC("javac"), JAVADOC("javadoc"), - JAVAH("javah"), JAVAP("javap"), JSHELL("jshell"); --- old/make/nb_native/nbproject/configurations.xml 2017-12-19 13:43:38.882100423 -0800 +++ new/make/nb_native/nbproject/configurations.xml 2017-12-19 13:43:38.470082287 -0800 @@ -6670,18 +6670,6 @@ examples.not-yet.txt - - - - - TestClass1.h - TestClass1_Inner1.h - TestClass1_Inner2.h - TestClass2.h - - - - @@ -40850,26 +40838,6 @@ ex="false" tool="3" flavor2="0"> - - - - - - - - - - - - --- old/make/langtools/test/bootstrap/javah.sh 2017-12-19 13:43:41.198202372 -0800 +++ /dev/null 2017-01-21 22:54:52.877512947 -0800 @@ -1,40 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2002, 2007, 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. -# - -# @test -# @summary Verify the basic execution of the bootstrap javah tool. - -TESTSRC=${TESTSRC:-.} -TOPDIR=${TESTSRC}/../../.. - -${TOPDIR}/dist/bootstrap/bin/javac -d . "${TESTSRC}"/../HelloWorld.java -${TOPDIR}/dist/bootstrap/bin/javah -classpath . -d . HelloWorld - -if diff ${TESTSRC}/../HelloWorld.gold.h HelloWorld.h ; then - echo "Test passed." -else - echo "Test failed." - exit 1 -fi --- old/make/langtools/test/lib/javah.sh 2017-12-19 13:43:41.678223502 -0800 +++ /dev/null 2017-01-21 22:54:52.877512947 -0800 @@ -1,46 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2002, 2007, 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. -# - -# @test -# @summary Verify the basic execution of the javah classes in classes.jar. - -TESTSRC=${TESTSRC:-.} -TOPDIR=${TESTSRC}/../../.. -TESTJAVAEXE="${TESTJAVA:+${TESTJAVA}/bin/}java" - -"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \ - com.sun.tools.javac.Main \ - -d . "${TESTSRC}"/../HelloWorld.java - -"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \ - com.sun.tools.javah.Main \ - -classpath . -d . HelloWorld - -if diff ${TESTSRC}/../HelloWorld.gold.h HelloWorld.h ; then - echo "Test passed." -else - echo "Test failed." - exit 1 -fi