equal
deleted
inserted
replaced
228 ) |
228 ) |
229 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
229 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
230 NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) |
230 NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) |
231 MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024) |
231 MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024) |
232 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
232 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
233 NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line) |
233 NUM_CORES := $(shell /usr/sbin/psrinfo -v | $(GREP) -c on-line) |
234 MEMORY_SIZE := $(shell \ |
234 MEMORY_SIZE := $(shell \ |
235 /usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \ |
235 /usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \ |
236 ) |
236 ) |
237 else ifeq ($(OPENJDK_TARGET_OS), windows) |
237 else ifeq ($(OPENJDK_TARGET_OS), windows) |
238 NUM_CORES := $(NUMBER_OF_PROCESSORS) |
238 NUM_CORES := $(NUMBER_OF_PROCESSORS) |
335 SPEC := $(NEW_SPEC) |
335 SPEC := $(NEW_SPEC) |
336 |
336 |
337 default: all |
337 default: all |
338 |
338 |
339 run-test-prebuilt: |
339 run-test-prebuilt: |
|
340 # Need to make sure the failure logs output dir exists since |
|
341 # ExecuteWithLog is called in RunTests.gmk. The PrepareFailureLogs macro |
|
342 # is unfortunately not available at this point. |
|
343 $(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs) |
340 @$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error |
344 @$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error |
341 # The lazy initialization of the cache file in FindTests.gmk does not |
345 # The lazy initialization of the cache file in FindTests.gmk does not |
342 # always work with RunTests.gmk. To guarantee that the jtreg test groups |
346 # always work with RunTests.gmk. To guarantee that the jtreg test groups |
343 # are always found and parsed, call FindTests.gmk stand alone once |
347 # are always found and parsed, call FindTests.gmk stand alone once |
344 # before calling RunTests.gmk. |
348 # before calling RunTests.gmk. |