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

Thu, 11 Dec 2014 18:23:17 -0800

author
jjg
date
Thu, 11 Dec 2014 18:23:17 -0800
changeset 2806
d35c539d0e6d
parent 2805
f6c191e92814
child 2807
e7e42c79861e

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

test/Makefile file | annotate | diff | comparison | revisions
     1.1 --- a/test/Makefile	Tue May 26 10:00:55 2015 -0700
     1.2 +++ b/test/Makefile	Thu Dec 11 18:23:17 2014 -0800
     1.3 @@ -21,7 +21,6 @@
     1.4  ifeq ($(OSNAME), SunOS)
     1.5    SLASH_JAVA = /java
     1.6    PLATFORM = solaris
     1.7 -  JT_PLATFORM = solaris
     1.8    ARCH = $(shell uname -p)
     1.9    ifeq ($(ARCH), i386)
    1.10      ARCH=i586
    1.11 @@ -30,7 +29,6 @@
    1.12  ifeq ($(OSNAME), Linux)
    1.13    SLASH_JAVA = /java
    1.14    PLATFORM = linux
    1.15 -  JT_PLATFORM = linux
    1.16    ARCH = $(shell uname -m)
    1.17    ifeq ($(ARCH), i386)
    1.18      ARCH=i586
    1.19 @@ -38,7 +36,6 @@
    1.20  endif
    1.21  ifeq ($(OSNAME), Darwin)
    1.22    PLATFORM = bsd
    1.23 -  JT_PLATFORM = linux
    1.24    ARCH = $(shell uname -m)
    1.25    ifeq ($(ARCH), i386)
    1.26      ARCH=i586
    1.27 @@ -55,7 +52,6 @@
    1.28  
    1.29  ifeq ($(PLATFORM), windows)
    1.30    SLASH_JAVA = J:
    1.31 -  JT_PLATFORM = win32
    1.32    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
    1.33      ARCH=ia64
    1.34    else
    1.35 @@ -93,8 +89,8 @@
    1.36  else
    1.37    JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg
    1.38  endif
    1.39 -JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
    1.40 -JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
    1.41 +JTREG = $(JTREG_HOME)/bin/jtreg
    1.42 +JTDIFF = $(JTREG_HOME)/bin/jtdiff
    1.43  
    1.44  # Default JCK to run
    1.45  ifdef JPRT_JCK_HOME

mercurial