make/Main.gmk

*** 482,503 ****
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
  
    exploded-test-$1:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
              TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
- 
  endef
  
  # ALL_NAMED_TESTS is defined in FindTests.gmk
  $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t)))
  ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS))
  
  # We only support the "exploded-test-gtest" shortcut
  ALL_EXPLODED_TESTS := gtest
  ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS))
  
! ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS)
  
  ################################################################################
  # Build tests and microbenchmarks
  #
  
--- 482,511 ----
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
  
    exploded-test-$1:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
              TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
  endef
  
  # ALL_NAMED_TESTS is defined in FindTests.gmk
  $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t)))
  ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS))
  
+ define DeclareRunJCovTestRecipe
+   jcov-test-$1:
+         +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Coverage.gmk jcov-run-test  TEST="$1")
+ endef
+ 
+ # jcov-test only makes sense for java tests
+ $(foreach t, $(JCOV_NAMED_TESTS), $(eval $(call DeclareRunJCovTestRecipe,$t)))
+ ALL_JCOV_TEST_TARGETS := $(addprefix jcov-test-, $(JCOV_NAMED_TESTS))
+ 
  # We only support the "exploded-test-gtest" shortcut
  ALL_EXPLODED_TESTS := gtest
  ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS))
  
! ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) $(ALL_JCOV_TEST_TARGETS)
  
  ################################################################################
  # Build tests and microbenchmarks
  #
  
*** 566,576 ****
  
  exploded-test:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
              TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
  
! ALL_TARGETS += test exploded-test
  
  ################################################################################
  # Bundles
  
  product-bundles:
--- 574,587 ----
  
  exploded-test:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
              TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
  
! jcov-test:
!         +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Coverage.gmk jcov-run-test  TEST="$(TEST)")
! 
! ALL_TARGETS += test exploded-test jcov-test
  
  ################################################################################
  # Bundles
  
  product-bundles: