Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8191736: replace javah w/ javac in jdk tests
authorshurailine
Wed, 22 Nov 2017 02:07:08 -0800
changeset 47922 7ee304ab728f
parent 47921 4501f0b68a31
child 47924 90f4803a2663
8191736: replace javah w/ javac in jdk tests Reviewed-by: serb, jjg
test/jdk/java/awt/JAWT/JAWT.sh file | annotate | diff | comparison | revisions
test/jdk/java/awt/JAWT/Makefile.cygwin file | annotate | diff | comparison | revisions
test/jdk/java/awt/JAWT/Makefile.unix file | annotate | diff | comparison | revisions
test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile file | annotate | diff | comparison | revisions 
--- a/test/jdk/java/awt/JAWT/JAWT.sh	Wed Nov 22 22:24:11 2017 +0530
+++ b/test/jdk/java/awt/JAWT/JAWT.sh	Wed Nov 22 02:07:08 2017 -0800
@@ -158,12 +158,10 @@
 
 JAVA=${TESTJAVA}${FS}bin${FS}java
 JAVAC=${TESTJAVA}${FS}bin${FS}javac
-JAVAH=${TESTJAVA}${FS}bin${FS}javah
 
 export CC SYST ARCH LD_LIBRARY_PATH
 
-${JAVAC} -d . ${TESTSRC}${FS}MyCanvas.java
-${JAVAH} -jni -classpath . -d . MyCanvas
+${JAVAC} -d . -h . ${TESTSRC}${FS}MyCanvas.java
 ${MAKE} -f ${MAKEFILE}
 ${JAVA} ${TESTVMOPTS} -classpath . MyCanvas
 
--- a/test/jdk/java/awt/JAWT/Makefile.cygwin	Wed Nov 22 22:24:11 2017 +0530
+++ b/test/jdk/java/awt/JAWT/Makefile.cygwin	Wed Nov 22 02:07:08 2017 -0800
@@ -26,7 +26,6 @@
 
 JAVA =		$(TESTJAVA)/bin/java -classpath .
 JAVAC =		$(TESTJAVA)/bin/javac
-JAVAH =		$(TESTJAVA)/bin/javah
 DEL =		rm -rf
 LINK =		$(CC)
 
--- a/test/jdk/java/awt/JAWT/Makefile.unix	Wed Nov 22 22:24:11 2017 +0530
+++ b/test/jdk/java/awt/JAWT/Makefile.unix	Wed Nov 22 02:07:08 2017 -0800
@@ -27,7 +27,6 @@
 ENV =		/usr/bin/env
 JAVA =		$(TESTJAVA)/bin/java -classpath .
 JAVAC =		$(TESTJAVA)/bin/javac
-JAVAH =		$(TESTJAVA)/bin/javah
 LINK =		ld
 
 J_INC =		$(TESTJAVA)/include
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Wed Nov 22 22:24:11 2017 +0530
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Wed Nov 22 02:07:08 2017 -0800
@@ -68,11 +68,8 @@
 	$(CC) -c $(CFLAGS) -o $(LIBDIR)/Launcher.o \
 	    -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) Launcher.c
 	
-Launcher.h : Launcher.class
-	$(JAVA_HOME)/bin/javah -force Launcher
-
-Launcher.class : Launcher.java
-	$(JAVA_HOME)/bin/javac Launcher.java
+Launcher.class Launcher.h : Launcher.java
+	$(JAVA_HOME)/bin/javac -h . Launcher.java
 
 java_home:
 ifndef JAVA_HOME
jdk-sandbox