comparison test/Makefile @ 10143:c4af77d20454 hs25-b30

Merge
author amurillo
date Fri, 26 Apr 2013 00:29:11 -0700
parents 393fd4ef89c4
children d96f52012aaa
comparison
equal deleted inserted replaced
10124:d080f5168deb 10143:c4af77d20454
160 ################################################################ 160 ################################################################
161 161
162 # jtreg tests 162 # jtreg tests
163 163
164 # Expect JT_HOME to be set for jtreg tests. (home for jtreg) 164 # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
165 JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg 165 ifndef JT_HOME
166 JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
167 endif
166 ifdef JPRT_JTREG_HOME 168 ifdef JPRT_JTREG_HOME
167 JT_HOME = $(JPRT_JTREG_HOME) 169 JT_HOME = $(JPRT_JTREG_HOME)
168 endif 170 endif
169 171
170 # Expect JPRT to set TESTDIRS to the jtreg test dirs 172 # Expect JPRT to set TESTDIRS to the jtreg test dirs