6799452: HotSpot tests Makefile should take care of ALT_SLASH_JAVA
The HotSpot tests Makefile has a hardcoded SLASH_JAVA which makes it difficult to run the tests on non-Sun build machines which do not have a /java infrastructure. Reviewed-by: kamg
This commit is contained in:
parent
ecbdf3bb83
commit
17d35f31a2
@ -28,9 +28,9 @@
|
|||||||
|
|
||||||
# Get OS/ARCH specifics
|
# Get OS/ARCH specifics
|
||||||
OSNAME = $(shell uname -s)
|
OSNAME = $(shell uname -s)
|
||||||
SLASH_JAVA = /java
|
|
||||||
ifeq ($(OSNAME), SunOS)
|
ifeq ($(OSNAME), SunOS)
|
||||||
PLATFORM = solaris
|
PLATFORM = solaris
|
||||||
|
SLASH_JAVA = /java
|
||||||
ARCH = $(shell uname -p)
|
ARCH = $(shell uname -p)
|
||||||
ifeq ($(ARCH), i386)
|
ifeq ($(ARCH), i386)
|
||||||
ARCH=i586
|
ARCH=i586
|
||||||
@ -38,6 +38,7 @@ ifeq ($(OSNAME), SunOS)
|
|||||||
endif
|
endif
|
||||||
ifeq ($(OSNAME), Linux)
|
ifeq ($(OSNAME), Linux)
|
||||||
PLATFORM = linux
|
PLATFORM = linux
|
||||||
|
SLASH_JAVA = /java
|
||||||
ARCH = $(shell uname -m)
|
ARCH = $(shell uname -m)
|
||||||
ifeq ($(ARCH), i386)
|
ifeq ($(ARCH), i386)
|
||||||
ARCH = i586
|
ARCH = i586
|
||||||
@ -62,6 +63,10 @@ ifeq ($(OSNAME), Windows_NT)
|
|||||||
EXESUFFIX = .exe
|
EXESUFFIX = .exe
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef ALT_SLASH_JAVA
|
||||||
|
SLASH_JAVA = $(ALT_SLASH_JAVA)
|
||||||
|
endif
|
||||||
|
|
||||||
# Utilities used
|
# Utilities used
|
||||||
CD = cd
|
CD = cd
|
||||||
CP = cp
|
CP = cp
|
||||||
|
Loading…
Reference in New Issue
Block a user