equal
deleted
inserted
replaced
28 endif |
28 endif |
29 endif |
29 endif |
30 ifeq ($(OSNAME), Linux) |
30 ifeq ($(OSNAME), Linux) |
31 SLASH_JAVA = /java |
31 SLASH_JAVA = /java |
32 PLATFORM = linux |
32 PLATFORM = linux |
|
33 JT_PLATFORM = linux |
|
34 ARCH = $(shell uname -m) |
|
35 ifeq ($(ARCH), i386) |
|
36 ARCH=i586 |
|
37 endif |
|
38 endif |
|
39 ifeq ($(OSNAME), Darwin) |
|
40 PLATFORM = bsd |
33 JT_PLATFORM = linux |
41 JT_PLATFORM = linux |
34 ARCH = $(shell uname -m) |
42 ARCH = $(shell uname -m) |
35 ifeq ($(ARCH), i386) |
43 ifeq ($(ARCH), i386) |
36 ARCH=i586 |
44 ARCH=i586 |
37 endif |
45 endif |
249 # JTREG_OUTPUT_DIR |
257 # JTREG_OUTPUT_DIR |
250 # Where to write the results |
258 # Where to write the results |
251 # JTREG_REFERENCE |
259 # JTREG_REFERENCE |
252 # (Optional) reference results (e.g. work, report or summary.txt) |
260 # (Optional) reference results (e.g. work, report or summary.txt) |
253 # |
261 # |
|
262 jtreg_tests: jtreg-tests |
254 jtreg-tests: check-jtreg FRC |
263 jtreg-tests: check-jtreg FRC |
255 @rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \ |
264 @rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \ |
256 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt |
265 $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt |
257 @mkdir -p $(JTREG_OUTPUT_DIR) |
266 @mkdir -p $(JTREG_OUTPUT_DIR) |
258 JT_JAVA=$(JT_JAVA) $(JTREG) \ |
267 JT_JAVA=$(JT_JAVA) $(JTREG) \ |