comparison test/Makefile @ 1930:818603c7744d

Merge
author thartmann
date Thu, 28 Jan 2016 09:49:17 +0100
parents 909bcc7a8852
children cf3701bb0291
comparison
equal deleted inserted replaced
20:679d97e7517c 21:91c91bdc002f
1 # 1 #
2 # Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this 7 # published by the Free Software Foundation. Oracle designates this
58 all: jdk_all langtools_all jaxp_all 58 all: jdk_all langtools_all jaxp_all
59 59
60 # Bring in closed test targets if present 60 # Bring in closed test targets if present
61 -include $(TOPDIR)/closed/test/Makefile 61 -include $(TOPDIR)/closed/test/Makefile
62 62
63 ifeq ($(TEST_JOBS), 0)
64 JDK_TEST_JOBS=$(JOBS)
65 else
66 JDK_TEST_JOBS=$(TEST_JOBS)
67 endif
63 # Test targets 68 # Test targets
64 langtools_% : 69 langtools_% :
65 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) 70 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), CONCURRENCY=$(JDK_TEST_JOBS) JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
66 71
67 jdk_% core_%s svc_%: 72 jdk_% core_%s svc_%:
68 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) 73 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), CONCURRENCY=$(JDK_TEST_JOBS) TEST="$@" $@)
69 74
70 jaxp_%: 75 jaxp_%:
71 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), TEST="$@" $@) 76 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JAXP_DIR), CONCURRENCY=$(JDK_TEST_JOBS) TEST="$@" $@)
72 77
78 ifeq ($(TEST_JOBS), 0)
79 HOTSPOT_TEST_JOBS=1
80 else
81 HOTSPOT_TEST_JOBS=$(TEST_JOBS)
82 endif
73 hotspot_%: 83 hotspot_%:
74 @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) 84 @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), CONCURRENCY=$(HOTSPOT_TEST_JOBS) TEST="$@" $@)
75 85
76 # 86 #
77 # jtreg_tests 87 # jtreg_tests
78 # 88 #
79 # Invocation: 89 # Invocation: