equal
deleted
inserted
replaced
48 else |
48 else |
49 ARCH=i586 |
49 ARCH=i586 |
50 endif |
50 endif |
51 endif |
51 endif |
52 endif |
52 endif |
|
53 EXE_SUFFIX=.exe |
53 endif |
54 endif |
54 |
55 |
55 # Root of this test area (important to use full paths in some places) |
56 # Root of this test area (important to use full paths in some places) |
56 TEST_ROOT := $(shell pwd) |
57 TEST_ROOT := $(shell pwd) |
57 |
58 |
103 endif |
104 endif |
104 |
105 |
105 # PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from |
106 # PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from |
106 # make/Makefile |
107 # make/Makefile |
107 # For langtools, this is a directory containing build and dist |
108 # For langtools, this is a directory containing build and dist |
108 # For a control build, this is build/$(PRODUCT)-$(ARCH)/j2sdk-image |
109 # For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image |
|
110 # (i.e, j2sdk-image or jdk-module-image) |
109 ifdef PRODUCT_HOME |
111 ifdef PRODUCT_HOME |
110 ifeq ($(shell [ -r $(PRODUCT_HOME)/dist/lib/classes.jar ]; echo $$?),0) |
112 ifeq ($(shell [ -r $(PRODUCT_HOME)/dist/lib/classes.jar ]; echo $$?),0) |
111 TESTBOOTCLASSPATH = $(PRODUCT_HOME)/dist/lib/classes.jar |
113 TESTBOOTCLASSPATH = $(PRODUCT_HOME)/dist/lib/classes.jar |
112 endif |
114 endif |
113 ifeq ($(shell [ -r $(PRODUCT_HOME)/lib/tools.jar ]; echo $$?),0) |
115 ifeq ($(shell [ -r $(PRODUCT_HOME)/bin/javac$(EXE_SUFFIX) ]; echo $$?),0) |
114 TESTJAVA = $(PRODUCT_HOME) |
116 TESTJAVA = $(PRODUCT_HOME) |
115 endif |
117 endif |
116 endif |
118 endif |
117 |
119 |
118 ifdef TESTBOOTCLASSPATH |
120 ifdef TESTBOOTCLASSPATH |