Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/Makefile	Fri Sep 27 10:39:52 2013 -0700
     1.2 +++ b/test/Makefile	Fri Sep 27 11:34:32 2013 -0700
     1.3 @@ -7,7 +7,7 @@
     1.4  # A full product build (or "control" build) creates a complete JDK image.
     1.5  # To test a product build, set TESTJAVA to the path for the image.
     1.6  #
     1.7 -# A langtools build just builds the langtools components of a JDK. 
     1.8 +# A langtools build just builds the langtools components of a JDK.
     1.9  # To test a langtools build, set TESTJAVA to the path for a recent JDK
    1.10  # build, and set TESTBOOTCLASSPATH to the compiled langtools classes --
    1.11  # for example build/classes or dist/lib/classes.jar.
    1.12 @@ -122,10 +122,10 @@
    1.13    TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
    1.14  endif
    1.15  
    1.16 -# PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from 
    1.17 +# PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from
    1.18  # make/Makefile
    1.19  # For langtools, this is a directory containing build and dist
    1.20 -# For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image 
    1.21 +# For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image
    1.22  #	(i.e, j2sdk-image or jdk-module-image)
    1.23  ifdef PRODUCT_HOME
    1.24    ifeq ($(shell [ -r $(PRODUCT_HOME)/dist/lib/classes.jar ]; echo $$?),0)
    1.25 @@ -139,13 +139,13 @@
    1.26  ifdef TESTBOOTCLASSPATH
    1.27    JTREG_OPTIONS += -Xbootclasspath/p:$(TESTBOOTCLASSPATH)
    1.28  ### In the following, -refvmoptions is an undocumented option
    1.29 -### The following does not work JCK 7 b30 2/6/2010. Awaiting b31. 
    1.30 +### The following does not work JCK 7 b30 2/6/2010. Awaiting b31.
    1.31    JCK_OPTIONS += \
    1.32  	-vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \
    1.33  	-refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH)
    1.34  endif
    1.35  
    1.36 -# Concurrency is the number of tests that can execute at once. 
    1.37 +# Concurrency is the number of tests that can execute at once.
    1.38  # On an otherwise empty machine, suggest setting to (#cpus + 2)
    1.39  # If unset, the default is (#cpus)
    1.40  ### RFE: determine and use #cpus
    1.41 @@ -206,7 +206,7 @@
    1.42  # Exit -- used for final "normal" exit from "make". Redefine to "true" to avoid
    1.43  # having make exit with non-zero return code.
    1.44  EXIT = exit
    1.45 -# Function to exit shell if exit code of preceding command is greater than or equal 
    1.46 +# Function to exit shell if exit code of preceding command is greater than or equal
    1.47  # to a given level. Redefine function or preceding FATAL_*_EXIT codes as needed.
    1.48  EXIT_IF_FATAL = status=$$?; if [ $$status -ge $(1) ]; then exit $$status ; fi
    1.49  
    1.50 @@ -217,8 +217,8 @@
    1.51  # Root of all test results
    1.52  TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
    1.53  ABS_TEST_OUTPUT_DIR := \
    1.54 -	$(shell mkdir -p $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
    1.55 -		cd  $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
    1.56 +	$(shell mkdir -p $(TEST_OUTPUT_DIR); \
    1.57 +		cd  $(TEST_OUTPUT_DIR); \
    1.58  		pwd $(CYGPATH))
    1.59  # Subdirectories for different test runs
    1.60  JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg
    1.61 @@ -255,7 +255,7 @@
    1.62  # JT_JAVA
    1.63  #	Version of java used to run jtreg.  Should normally be the same as TESTJAVA
    1.64  # TESTJAVA
    1.65 -# 	Version of java to be tested.  
    1.66 +# 	Version of java to be tested.
    1.67  # JTREG_OPTIONS
    1.68  #	Additional options for jtreg
    1.69  # JTREG_TESTDIRS
    1.70 @@ -311,7 +311,7 @@
    1.71  #	Version of java used to run JCK.  Should normally be the same as TESTJAVA
    1.72  #       Default is JDK 7
    1.73  # TESTJAVA
    1.74 -# 	Version of java to be tested.  
    1.75 +# 	Version of java to be tested.
    1.76  # JCK_COMPILER_OPTIONS
    1.77  #	Additional options for JCK-compiler
    1.78  # JCK_COMPILER_TESTDIRS
    1.79 @@ -360,7 +360,7 @@
    1.80  # JT_JAVA
    1.81  #	Version of java used to run JCK.  Should normally be the same as TESTJAVA
    1.82  # TESTJAVA
    1.83 -# 	Version of java to be tested.  
    1.84 +# 	Version of java to be tested.
    1.85  # JCK_RUNTIME_OPTIONS
    1.86  #	Additional options for JCK-runtime
    1.87  # JCK_RUNTIME_TESTDIRS