stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6954901: langtools/test/Makefile should check for bin/javac(.exe) instead of lib/tools.jar

Browse Source 
Reviewed-by: ohair
This commit is contained in:
Jonathan Gibbons 2010-05-21 17:32:19 -07:00
parent 836fb6fe52
commit 1955a6c375
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
langtools/test/Makefile
View File

@ -50,6 +50,7 @@ ifeq ($(OSNAME), Windows_NT)
endif
endif
endif
EXE_SUFFIX=.exe
endif
# Root of this test area (important to use full paths in some places)
@ -105,12 +106,13 @@ endif
# PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from
# make/Makefile
# For langtools, this is a directory containing build and dist
# For a control build, this is build/$(PRODUCT)-$(ARCH)/j2sdk-image
# For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image
# (i.e, j2sdk-image or jdk-module-image)
ifdef PRODUCT_HOME
ifeq ($(shell [ -r $(PRODUCT_HOME)/dist/lib/classes.jar ]; echo $$?),0)
TESTBOOTCLASSPATH = $(PRODUCT_HOME)/dist/lib/classes.jar
endif
ifeq ($(shell [ -r $(PRODUCT_HOME)/lib/tools.jar ]; echo $$?),0)
ifeq ($(shell [ -r $(PRODUCT_HOME)/bin/javac$(EXE_SUFFIX) ]; echo $$?),0)
TESTJAVA = $(PRODUCT_HOME)
endif
endif