< prev index next >

make/RunTestsPrebuilt.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2018, 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

@@ -93,16 +93,16 @@
 # Create an ephemeral spec file
 #
 # $1: The output file name
 # $2..$N: The lines to output to the file
 define CreateNewSpec
-  $(if $(strip $(33)), \
+  $(if $(strip $(31)), \
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
   $(shell $(RM) $1) \
-  $(foreach i, $(call sequence, 2, 32), \
+  $(foreach i, $(call sequence, 2, 30), \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \
   )
 endef

@@ -235,12 +235,11 @@
       /usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \
   )
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
-          | $(GREP) = | $(SED) 's/\\r//g' \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
           | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif
 ifeq ($(NUM_CORES), )
   $(warn Could not find number of CPUs, assuming 1)

@@ -252,39 +251,35 @@
 endif
 
 # Setup LD for AOT support
 ifneq ($(DEVKIT_HOME), )
   ifeq ($(OPENJDK_TARGET_OS), windows)
-    LD_JAOTC := $(DEVKIT_HOME)/VC/bin/x64/link.exe
+    LD := $(DEVKIT_HOME)/VC/bin/x64/link
     LIBRARY_PREFIX :=
     SHARED_LIBRARY_SUFFIX := .dll
+    EXE_SUFFIX := .exe
   else ifeq ($(OPENJDK_TARGET_OS), linux)
-    LD_JAOTC := $(DEVKIT_HOME)/bin/ld
+    LD := $(DEVKIT_HOME)/bin/ld
     LIBRARY_PREFIX := lib
     SHARED_LIBRARY_SUFFIX := .so
+    EXE_SUFFIX :=
   else ifeq ($(OPENJDK_TARGET_OS), macosx)
-    LD_JAOTC := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+    LD := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
     LIBRARY_PREFIX := lib
     SHARED_LIBRARY_SUFFIX := .dylib
+    EXE_SUFFIX :=
   else ifeq ($(OPENJDK_TARGET_OS), solaris)
     # Prefer system linker for AOT on Solaris.
-    LD_JAOTC := ld
+    LD := ld
     LIBRARY_PREFIX := lib
     SHARED_LIBRARY_SUFFIX := .so
+    EXE_SUFFIX :=
   endif
 else
   LD := ld
 endif
 
-ifneq ($(wildcard $(JDK_IMAGE_DIR)/template.xml), )
-  TEST_OPTS_JCOV := true
-  JCOV_IMAGE_DIR := $(JDK_IMAGE_DIR)
-else
-  TEST_OPTS_JCOV := false
-  JCOV_IMAGE_DIR :=
-endif
-
 ################################################################################
 # Generate the ephemeral spec file
 ################################################################################
 
 # Now we can include additional custom support.

@@ -301,11 +296,10 @@
     TOPDIR := $(TOPDIR), \
     OUTPUTDIR := $(OUTPUTDIR), \
     BOOT_JDK := $(BOOT_JDK), \
     JT_HOME := $(JT_HOME), \
     JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
-    JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \
     TEST_IMAGE_DIR := $(TEST_IMAGE_DIR), \
     SYMBOLS_IMAGE_DIR := $(SYMBOLS_IMAGE_DIR), \
     MAKE := $(MAKE), \
     BASH := $(BASH), \
     JIB_JAR := $(JIB_JAR), \

@@ -318,15 +312,15 @@
     OPENJDK_TARGET_CPU_ARCH := $(OPENJDK_TARGET_CPU_ARCH), \
     OPENJDK_TARGET_CPU_BITS := $(OPENJDK_TARGET_CPU_BITS), \
     OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \
     NUM_CORES := $(NUM_CORES), \
     MEMORY_SIZE := $(MEMORY_SIZE), \
-    LD_JAOTC := $(LD_JAOTC), \
+    LD := $(LD), \
     LIBRARY_PREFIX := $(LIBRARY_PREFIX), \
     SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \
+    EXE_SUFFIX := $(EXE_SUFFIX), \
     include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
-    TEST_OPTS_JCOV := $(TEST_OPTS_JCOV), \
     $(CUSTOM_NEW_SPEC_LINE), \
 )
 
 ################################################################################
 # The run-test-prebuilt target

@@ -335,21 +329,11 @@
 SPEC := $(NEW_SPEC)
 
 default: all
 
 run-test-prebuilt:
-        # Need to make sure the failure logs output dir exists since
-        # ExecuteWithLog is called in RunTests.gmk. The PrepareFailureLogs macro
-        # is unfortunately not available at this point.
-        $(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs)
         @$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
-        # The lazy initialization of the cache file in FindTests.gmk does not
-        # always work with RunTests.gmk. To guarantee that the jtreg test groups
-        # are always found and parsed, call FindTests.gmk stand alone once
-        # before calling RunTests.gmk.
-        @cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/common/FindTests.gmk \
-            SPEC=$(SPEC) FINDTESTS_STAND_ALONE=true
         @cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
             TEST="$(TEST)"
 
 all: run-test-prebuilt
 
< prev index next >