stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8157028: Add make target for running gtest tests

Browse Source 
Reviewed-by: erikj, jwilhelm
This commit is contained in:
Erik Helin 2016-05-16 12:33:22 +02:00
parent bde74b92a0
commit a2ce513fbd
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
make/Main.gmk
View File

@ -433,25 +433,28 @@ ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
# Run tests specified by $(TEST), or the default test set. # Run tests specified by $(TEST), or the default test set.
test: test:
$(call RunTests, $(TEST)) $(call RunTests, $(TEST), $(JDK_IMAGE_DIR))
test-hotspot-jtreg: test-hotspot-jtreg:
$(call RunTests, "hotspot_all") $(call RunTests, "hotspot_all", $(JDK_IMAGE_DIR))
test-hotspot-jtreg-native: test-hotspot-jtreg-native:
$(call RunTests, "hotspot_native_sanity") $(call RunTests, "hotspot_native_sanity", $(JDK_IMAGE_DIR))
test-hotspot-internal: test-hotspot-internal:
$(call RunTests, "hotspot_internal") $(call RunTests, "hotspot_internal", $(JDK_OUTPUTDIR))
test-hotspot-gtest:
$(call RunTests, "hotspot_gtest", $(JDK_OUTPUTDIR))
test-jdk-jtreg-native: test-jdk-jtreg-native:
$(call RunTests, "jdk_native_sanity") $(call RunTests, "jdk_native_sanity", $(JDK_IMAGE_DIR))
test-make: test-make:
($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET)) ($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \ ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
test-hotspot-internal test-jdk-jtreg-native test-make test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
################################################################################ ################################################################################
# Bundles # Bundles
@ -690,6 +693,8 @@ else
test-hotspot-jtreg: jimages test-image test-hotspot-jtreg: jimages test-image
test-hotspot-gtest: exploded-image test-image-hotspot-gtest
install: product-images install: product-images
product-bundles: product-images product-bundles: product-images

4
make/MainSupport.gmk
View File

@ -30,10 +30,10 @@
ifndef _MAINSUPPORT_GMK ifndef _MAINSUPPORT_GMK
_MAINSUPPORT_GMK := 1 _MAINSUPPORT_GMK := 1
# Run the tests specified by $1. # Run the tests specified by $1, with PRODUCT_HOME specified by $2
define RunTests define RunTests
($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \ ($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \ JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \
TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \ TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \ ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \
JOBS=$(JOBS) $1) || true JOBS=$(JOBS) $1) || true