Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/Makefile	Wed Oct 26 12:28:51 2011 -0700
     1.2 +++ b/test/Makefile	Tue Nov 01 15:49:45 2011 -0700
     1.3 @@ -19,6 +19,7 @@
     1.4  # Get OS/ARCH specifics
     1.5  OSNAME = $(shell uname -s)
     1.6  ifeq ($(OSNAME), SunOS)
     1.7 +  SLASH_JAVA = /java
     1.8    PLATFORM = solaris
     1.9    JT_PLATFORM = solaris
    1.10    ARCH = $(shell uname -p)
    1.11 @@ -27,6 +28,7 @@
    1.12    endif
    1.13  endif
    1.14  ifeq ($(OSNAME), Linux)
    1.15 +  SLASH_JAVA = /java
    1.16    PLATFORM = linux
    1.17    JT_PLATFORM = linux
    1.18    ARCH = $(shell uname -m)
    1.19 @@ -35,7 +37,16 @@
    1.20    endif
    1.21  endif
    1.22  ifeq ($(OSNAME), Windows_NT)
    1.23 +  # MKS
    1.24 +  PLATFORM=windows
    1.25 +endif
    1.26 +ifeq ($(PLATFORM),)
    1.27    PLATFORM = windows
    1.28 +  CYGPATH = | cygpath -m -s -f -
    1.29 +endif
    1.30 +
    1.31 +ifeq ($(PLATFORM), windows)
    1.32 +  SLASH_JAVA = J:
    1.33    JT_PLATFORM = win32
    1.34    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
    1.35      ARCH=ia64
    1.36 @@ -54,7 +65,7 @@
    1.37  endif
    1.38  
    1.39  # Root of this test area (important to use full paths in some places)
    1.40 -TEST_ROOT := $(shell pwd)
    1.41 +TEST_ROOT := $(shell pwd $(CYGPATH) )
    1.42  
    1.43  # Default bundle of all test results (passed or not) (JPRT only)
    1.44  ifdef JPRT_JOB_ID
    1.45 @@ -72,7 +83,7 @@
    1.46  ifdef JPRT_JTREG_HOME
    1.47    JTREG_HOME = $(JPRT_JTREG_HOME)
    1.48  else
    1.49 -  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
    1.50 +  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg
    1.51  endif
    1.52  JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
    1.53  JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
    1.54 @@ -81,7 +92,7 @@
    1.55  ifdef JPRT_JCK_HOME
    1.56    JCK_HOME = $(JPRT_JCK_HOME)
    1.57  else
    1.58 -  JCK_HOME = $(SLASH_JAVA)/re/jck/7/promoted/latest/binaries
    1.59 +  JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries
    1.60  endif
    1.61  
    1.62  # Default JDK for JTREG and JCK
    1.63 @@ -93,7 +104,7 @@
    1.64  ifdef JPRT_JAVA_HOME
    1.65    JT_JAVA = $(JPRT_JAVA_HOME)
    1.66  else
    1.67 -  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.6.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
    1.68 +  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.7.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
    1.69  endif
    1.70  
    1.71  # Default JDK to test
    1.72 @@ -195,7 +206,7 @@
    1.73  ABS_TEST_OUTPUT_DIR := \
    1.74  	$(shell mkdir -p $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
    1.75  		cd  $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
    1.76 -		pwd )
    1.77 +		pwd $(CYGPATH))
    1.78  # Subdirectories for different test runs
    1.79  JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg
    1.80  JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler
    1.81 @@ -272,15 +283,17 @@
    1.82  	fi
    1.83  
    1.84  # Check to make sure these directories exist
    1.85 -check-jtreg: $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
    1.86 +check-jtreg: $(PRODUCT_HOME) $(JTREG)
    1.87  
    1.88  
    1.89  # Run JCK-compiler tests
    1.90  #
    1.91  # JCK_HOME
    1.92  #	Installed location of JCK: should include JCK-compiler, and JCK-extras
    1.93 +#       Default is JCK 8.
    1.94  # JT_JAVA
    1.95  #	Version of java used to run JCK.  Should normally be the same as TESTJAVA
    1.96 +#       Default is JDK 7
    1.97  # TESTJAVA
    1.98  # 	Version of java to be tested.  
    1.99  # JCK_COMPILER_OPTIONS
   1.100 @@ -297,7 +310,7 @@
   1.101  	    $(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt
   1.102  	@mkdir -p $(JCK_COMPILER_OUTPUT_DIR)
   1.103  	$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
   1.104 -	    -jar $(JCK_HOME)/JCK-compiler-7/lib/jtjck.jar \
   1.105 +	    -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \
   1.106  	    -v:non-pass \
   1.107              -r:$(JCK_COMPILER_OUTPUT_DIR)/report \
   1.108              -w:$(JCK_COMPILER_OUTPUT_DIR)/work \
   1.109 @@ -346,7 +359,7 @@
   1.110  	    $(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt
   1.111  	@mkdir -p $(JCK_RUNTIME_OUTPUT_DIR)
   1.112  	$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
   1.113 -	    -jar $(JCK_HOME)/JCK-runtime-7/lib/jtjck.jar \
   1.114 +	    -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \
   1.115  	    -v:non-pass \
   1.116              -r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
   1.117              -w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
   1.118 @@ -373,7 +386,7 @@
   1.119  	fi
   1.120  
   1.121  # Check to make sure these directories exist
   1.122 -check-jck: $(JT_HOME) $(JCK_HOME) $(PRODUCT_HOME)
   1.123 +check-jck: $(JCK_HOME) $(PRODUCT_HOME)
   1.124  
   1.125  all-summary: FRC
   1.126  	if [ -n "`find $(TEST_OUTPUT_DIR) -name status.txt`" ]; then