make/MakeHelpers.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 295,311 ****
--- 295,325 ----
    endif
  endef
  
  ### Convenience functions from Main.gmk
  
+ # Run the tests specified by $1.
+ define RunTests
+         ($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
+             JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) \
+             TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
+             ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $1) || true
+ endef
+ 
  # Cleans the dir given as $1
  define CleanDir
          @$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
          @($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
          @$(PRINTF) " done\n"
  endef
  
+ define CleanTest
+         @$(PRINTF) "Cleaning test $(strip $1) ..."
+         @$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
+         @$(PRINTF) " done\n"
+ endef
+ 
  define Clean-gensrc
          @$(PRINTF) "Cleaning gensrc $(if $1,for $(strip $1) )..."
          @$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
          @$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$(strip $1)
          @$(PRINTF) " done\n"