make/jprt.properties

*** 67,79 ****
  jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
  jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
  jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
  jprt.optimizedOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
  
! # Select build flavors and build targets
! jprt.build.flavors=${my.is.hotspot.job ? ${my.build.flavors.hotspot} : ${my.build.flavors.default}}
! jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}}
  
  # Select test targets - jprt default for jprt.test.set is "default"
  jprt.test.targets=${my.test.targets.${jprt.test.set}}
  jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
  jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}}
--- 67,90 ----
  jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
  jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
  jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
  jprt.optimizedOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
  
! 
! # hotspot testset has custom build flavors and build targets
! my.jprt.testsetHasCustomBuildFlavors.hotspot=true
! my.jprt.testsetHasCustomBuildTargets.hotspot=true
! 
! # determine if the specified testset has custom build flavors or build targets
! my.jprt.testsetHasCustomBuildFlavors=${my.jprt.testsetHasCustomBuildFlavors.${jprt.test.set}}
! my.jprt.testsetHasCustomBuildTargets=${my.jprt.testsetHasCustomBuildTargets.${jprt.test.set}}
! 
! # Select build flavors and build targets based on the specified testset
! jprt.build.flavors=${my.jprt.testsetHasCustomBuildFlavors ? \
!     ${my.build.flavors.${jprt.test.set}} : ${my.build.flavors.default}}
! jprt.build.targets=${my.jprt.testsetHasCustomBuildTargets ? \
!     ${my.build.targets.${jprt.test.set}} : ${my.build.targets.default}}
  
  # Select test targets - jprt default for jprt.test.set is "default"
  jprt.test.targets=${my.test.targets.${jprt.test.set}}
  jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
  jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}}