Skip to content
Permalink
Browse files

Removed references to HOTSPOT_BUILD_JOBS from all scripts and config

  • Loading branch information
neomatrix369 committed Jun 19, 2019
1 parent 7ea8213 commit df28ee78be289a364dcdf3bdd626bd4a40460a28
@@ -53,7 +53,6 @@ jobs:
echo 'export GRAAL_JVMCI_8_TAG=master' >> ${BASH_ENV}
echo 'export BUILD_ARTIFACTS_DIR=${BASEDIR}/${JDK_GRAAL_FOLDER_NAME}' >> ${BASH_ENV}
echo 'export RUN_TESTS="true"' >> ${BASH_ENV}
echo 'export HOTSPOT_BUILD_JOBS=2' >> ${BASH_ENV}
source ${BASH_ENV}
- run:
name: Display HW, SW, Runtime env. info and versions of dependencies
@@ -19,8 +19,6 @@ gitClone oracle \
cd ${BASEDIR}/graal/compiler
export JVMCI_VERSION_CHECK='ignore'
echo ">>>> Setting environment variable JVMCI_VERSION_CHECK=${JVMCI_VERSION_CHECK}"
HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS:-$(getAllowedThreads)}
echo ">>>> Setting HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}"
echo ">>>> Setting BUILD_GRAAL_COMPILER_VERBOSE_MODE_FLAG=${BUILD_GRAAL_COMPILER_VERBOSE_MODE_FLAG:-}"
export JAVA_OPTS="${MAX_HEAP_SIZE_FLAG:-} -XX:+HeapDumpOnOutOfMemoryError -XX:+ShowMessageBoxOnError -XX:ErrorFile=${BASEDIR}/hs_err_pid%p.log -XX:HeapDumpPath=${BASEDIR}/java-heap-dump-%p ${JAVA_OPTS:-}"
echo ">>>> Setting JAVA_OPTS=${JAVA_OPTS}"
@@ -36,13 +36,11 @@ echo "Applying and checking patch to mx_jvmci.py..."
git apply ${SCRIPTS_LIB_DIR}/patch/mx-HotSpot-string-fix.patch || true
grep "re.search" -B 2 mx.jvmci/mx_jvmci.py || true

HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS:-$(getAllowedThreads)}
echo "Setting HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}"
export JAVA_OPTS="${MAX_HEAP_SIZE_FLAG:-} -XX:+HeapDumpOnOutOfMemoryError -XX:+ShowMessageBoxOnError -XX:ErrorFile=${BASEDIR}/hs_err_pid%p.log -XX:HeapDumpPath=${BASEDIR}/java-heap-dump-%p ${JAVA_OPTS:-}"
echo ">>>> Setting JAVA_OPTS=${JAVA_OPTS}"

MAX_CPUS=${MAX_CPUS:-$(getAvailableThreads)}
echo ">>>> Setting MAX_CPUS=${MAX_CPUS}"
set -x
HOTSPOT_BUILD_JOBS="${HOTSPOT_BUILD_JOBS}" ${MX} --max-cpus ${MAX_CPUS} "-A-J${JAVA_OPTS}" build
${MX} --max-cpus ${MAX_CPUS} "-A-J${JAVA_OPTS}" build
set +x

0 comments on commit df28ee7

Please sign in to comment.
You can’t perform that action at this time.