common/autoconf/generated-configure.sh

*** 648,657 ****
--- 648,658 ----
  JAVA_FLAGS
  TEST_JOBS
  JOBS
  MEMORY_SIZE
  NUM_CORES
+ BUILD_FAILURE_HANDLER
  ENABLE_INTREE_EC
  HOTSPOT_MAKE_ARGS
  LIBZIP_CAN_USE_MMAP
  LIBDL
  LIBM
*** 1170,1179 ****
--- 1171,1181 ----
  with_zlib
  with_lcms
  with_dxsdk
  with_dxsdk_lib
  with_dxsdk_include
+ enable_jtreg_failure_handler
  with_num_cores
  with_memory_size
  with_jobs
  with_test_jobs
  with_boot_jdk_jvmargs
*** 1938,1947 ****
--- 1940,1955 ----
                            data[disabled]
    --disable-freetype-bundling
                            disable bundling of the freetype library with the
                            build result [enabled on Windows or when using
                            --with-freetype, disabled otherwise]
+   --enable-jtreg-failure-handler
+                           forces build of the jtreg failure handler to be
+                           enabled, missing dependencies become fatal errors.
+                           Default is auto, where the failure handler is built
+                           if all dependencies are present and otherwise just
+                           disabled.
    --enable-sjavac         use sjavac to do fast incremental compiles
                            [disabled]
    --disable-javac-server  disable javac server [enabled]
    --enable-icecc          enable distribted compilation of native code using
                            icecc/icecream [disabled]
*** 4272,4281 ****
--- 4280,4295 ----
  # jlink options.
  # We always keep packaged modules in JDK image.
  #
  
  
+ ################################################################################
+ #
+ # Check if building of the jtreg failure handler should be enabled.
+ #
+ 
+ 
  #
  # Copyright (c) 2015, 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
*** 4948,4958 ****
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1460464859
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
--- 4962,4972 ----
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1460713327
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
*** 62035,62044 ****
--- 62049,62097 ----
    fi
  
  
  
  
+   # Check whether --enable-jtreg-failure-handler was given.
+ if test "${enable_jtreg_failure_handler+set}" = set; then :
+   enableval=$enable_jtreg_failure_handler;
+ fi
+ 
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jtreg failure handler should be built" >&5
+ $as_echo_n "checking if jtreg failure handler should be built... " >&6; }
+ 
+   if test "x$enable_jtreg_failure_handler" = "xyes"; then
+     if test "x$JT_HOME" = "x"; then
+       as_fn_error $? "Cannot enable jtreg failure handler without jtreg." "$LINENO" 5
+     else
+       BUILD_FAILURE_HANDLER=true
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
+ $as_echo "yes, forced" >&6; }
+     fi
+   elif test "x$enable_jtreg_failure_handler" = "xno"; then
+     BUILD_FAILURE_HANDLER=false
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
+ $as_echo "no, forced" >&6; }
+   elif test "x$enable_jtreg_failure_handler" = "xauto" \
+       || test "x$enable_jtreg_failure_handler" = "x"; then
+     if test "x$JT_HOME" = "x"; then
+       BUILD_FAILURE_HANDLER=false
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, missing jtreg" >&5
+ $as_echo "no, missing jtreg" >&6; }
+     else
+       BUILD_FAILURE_HANDLER=true
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, jtreg present" >&5
+ $as_echo "yes, jtreg present" >&6; }
+     fi
+   else
+     as_fn_error $? "Invalid value for --enable-jtreg-failure-handler: $enable_jtreg_failure_handler" "$LINENO" 5
+   fi
+ 
+ 
+ 
+ 
  ###############################################################################
  #
  # Configure parts of the build that only affect the build performance,
  # not the result.
  #