提交 2ff588f4 编写于 作者: J jjg

8066808: langtools/test/Makefile should not use OS-specific jtreg binary

Reviewed-by: mcimadamore
上级 524639b6
...@@ -21,7 +21,6 @@ OSNAME = $(shell uname -s) ...@@ -21,7 +21,6 @@ OSNAME = $(shell uname -s)
ifeq ($(OSNAME), SunOS) ifeq ($(OSNAME), SunOS)
SLASH_JAVA = /java SLASH_JAVA = /java
PLATFORM = solaris PLATFORM = solaris
JT_PLATFORM = solaris
ARCH = $(shell uname -p) ARCH = $(shell uname -p)
ifeq ($(ARCH), i386) ifeq ($(ARCH), i386)
ARCH=i586 ARCH=i586
...@@ -30,7 +29,6 @@ endif ...@@ -30,7 +29,6 @@ endif
ifeq ($(OSNAME), Linux) ifeq ($(OSNAME), Linux)
SLASH_JAVA = /java SLASH_JAVA = /java
PLATFORM = linux PLATFORM = linux
JT_PLATFORM = linux
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
ifeq ($(ARCH), i386) ifeq ($(ARCH), i386)
ARCH=i586 ARCH=i586
...@@ -38,7 +36,6 @@ ifeq ($(OSNAME), Linux) ...@@ -38,7 +36,6 @@ ifeq ($(OSNAME), Linux)
endif endif
ifeq ($(OSNAME), Darwin) ifeq ($(OSNAME), Darwin)
PLATFORM = bsd PLATFORM = bsd
JT_PLATFORM = linux
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
ifeq ($(ARCH), i386) ifeq ($(ARCH), i386)
ARCH=i586 ARCH=i586
...@@ -55,7 +52,6 @@ endif ...@@ -55,7 +52,6 @@ endif
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
SLASH_JAVA = J: SLASH_JAVA = J:
JT_PLATFORM = win32
ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64) ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
ARCH=ia64 ARCH=ia64
else else
...@@ -93,8 +89,8 @@ ifdef JPRT_JTREG_HOME ...@@ -93,8 +89,8 @@ ifdef JPRT_JTREG_HOME
else else
JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg
endif endif
JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg JTREG = $(JTREG_HOME)/bin/jtreg
JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff JTDIFF = $(JTREG_HOME)/bin/jtdiff
# Default JCK to run # Default JCK to run
ifdef JPRT_JCK_HOME ifdef JPRT_JCK_HOME
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册