equal
deleted
inserted
replaced
53 else |
53 else |
54 $$(info Variable $1 is missing, using default $2) |
54 $$(info Variable $1 is missing, using default $2) |
55 $1:=$2 |
55 $1:=$2 |
56 endif |
56 endif |
57 else |
57 else |
58 ifneq ($$(findstring $$(LOG_LEVEL), debug trace), ) |
58 ifneq ($$(findstring $$(LOG), debug trace), ) |
|
59 $$(info Prebuilt variable $1=$$($1)) |
|
60 endif |
|
61 endif |
|
62 endef |
|
63 |
|
64 define VerifyOptionalVariable |
|
65 ifeq ($$($1), ) |
|
66 ifneq ($$(findstring $$(LOG), debug trace), ) |
|
67 $$(info Optional prebuilt variable $1 not provided) |
|
68 endif |
|
69 else |
|
70 ifneq ($$(findstring $$(LOG), debug trace), ) |
59 $$(info Prebuilt variable $1=$$($1)) |
71 $$(info Prebuilt variable $1=$$($1)) |
60 endif |
72 endif |
61 endif |
73 endif |
62 endef |
74 endef |
63 |
75 |
94 |
106 |
95 # Provide default values for tools that we need |
107 # Provide default values for tools that we need |
96 $(eval $(call VerifyVariable,MAKE,make)) |
108 $(eval $(call VerifyVariable,MAKE,make)) |
97 $(eval $(call VerifyVariable,BASH,bash)) |
109 $(eval $(call VerifyVariable,BASH,bash)) |
98 |
110 |
|
111 # Check optional variables |
|
112 $(eval $(call VerifyOptionalVariable,JIB_JAR)) |
|
113 |
|
114 |
99 # Now that we have verified that we have the required variables available, we |
115 # Now that we have verified that we have the required variables available, we |
100 # can include the prebuilt spec file ourselves, without an ephemeral spec |
116 # can include the prebuilt spec file ourselves, without an ephemeral spec |
101 # wrapper. This is required so we can include MakeBase which is needed for |
117 # wrapper. This is required so we can include MakeBase which is needed for |
102 # CreateNewSpec. |
118 # CreateNewSpec. |
103 SPEC := $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk |
119 SPEC := $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk |
121 JT_HOME := $(JT_HOME), \ |
137 JT_HOME := $(JT_HOME), \ |
122 JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \ |
138 JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \ |
123 TEST_IMAGE_DIR := $(TEST_IMAGE_DIR), \ |
139 TEST_IMAGE_DIR := $(TEST_IMAGE_DIR), \ |
124 MAKE := $(MAKE), \ |
140 MAKE := $(MAKE), \ |
125 BASH := $(BASH), \ |
141 BASH := $(BASH), \ |
|
142 JIB_JAR := $(JIB_JAR), \ |
126 include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \ |
143 include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \ |
127 $(CUSTOM_NEW_SPEC_LINE), \ |
144 $(CUSTOM_NEW_SPEC_LINE), \ |
128 ) |
145 ) |
129 |
146 |
130 |
147 |