archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-25 22:04:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8059732: improve hotspot_*test targets

Browse source 
Reviewed-by: kvn, dholmes
This commit is contained in:
Igor Ignatyev 2014-11-17 12:57:49 +03:00
parent e2cd480dee
commit f81bd8ff29
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
hotspot/test/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,10 @@
# Makefile to run various hotspot tests # Makefile to run various hotspot tests
# #
ALT_MAKE ?= closed
-include $(ALT_MAKE)/Makefile
GETMIXEDPATH=echo GETMIXEDPATH=echo
# Utilities used # Utilities used
@ -305,14 +309,27 @@ jtreg_tests: prep $(PRODUCT_HOME) $(JTREG)
PHONY_LIST += jtreg_tests PHONY_LIST += jtreg_tests
# flags used to execute java in test targets
TEST_FLAGS += -version -Xinternalversion -X -help
sanitytest: prep $(PRODUCT_HOME)
@for flag in $(TEST_FLAGS); \
do \
echo Executing java $(JAVA_OPTIONS) $$flag; \
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) $$flag; \
res=$$?; \
if [ $$res -ne 0 ]; then \
exit $$res; \
fi; \
done
PHONY_LIST += sanitytest
################################################################ ################################################################
# clienttest (make sure various basic java client options work) # clienttest (make sure various basic java client options work)
hotspot_clienttest clienttest: prep $(PRODUCT_HOME) hotspot_clienttest clienttest: sanitytest
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -version
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
$(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes.jsa $(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes.jsa
$(RM) $(PRODUCT_HOME)/jre/bin/client/classes.jsa $(RM) $(PRODUCT_HOME)/jre/bin/client/classes.jsa
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -Xshare:dump $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -Xshare:dump
@ -323,10 +340,7 @@ PHONY_LIST += hotspot_clienttest clienttest
# minimaltest (make sure various basic java minimal options work) # minimaltest (make sure various basic java minimal options work)
hotspot_minimaltest minimaltest: prep $(PRODUCT_HOME) hotspot_minimaltest minimaltest: sanitytest
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -version
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
PHONY_LIST += hotspot_minimaltest minimaltest PHONY_LIST += hotspot_minimaltest minimaltest
@ -334,10 +348,7 @@ PHONY_LIST += hotspot_minimaltest minimaltest
# servertest (make sure various basic java server options work) # servertest (make sure various basic java server options work)
hotspot_servertest servertest: prep $(PRODUCT_HOME) hotspot_servertest servertest: sanitytest
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -version
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
PHONY_LIST += hotspot_servertest servertest PHONY_LIST += hotspot_servertest servertest