components/runtime/openjdk-7/patches/patch-jdk_test_Makefile.patch

   1 $NetBSD: patch-jdk_test_Makefile,v 1.2 2014/01/20 19:25:11 joerg Exp $
   2
   3 Use tools from pkgsrc.
   4
   5 --- jdk/test/Makefile.orig      2014-01-01 05:53:43.000000000 +0000
   6 +++ jdk/test/Makefile
   7 @@ -54,6 +54,8 @@ UNAME     = uname
   8  UNIQ      = uniq
   9  WC        = wc
  10  ZIP       = zip
  11 +UNZIP     = unzip
  12 +WHICH     = which
  13
  14  # Get OS name from uname
  15  UNAME_S := $(shell $(UNAME) -s)
  16 @@ -381,6 +383,12 @@ else
  17    JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
  18  endif
  19
  20 +# carry over XAUTHORITY
  21 +JTREG_TEST_OPTIONS += -e:XAUTHORITY
  22 +
  23 +# some tests expect to find zip and unzip on the path
  24 +JTREG_TEST_OPTIONS += -e:PATH=/bin:/usr/bin:$(dir $(shell $(WHICH) $(ZIP))):$(dir $(shell $(WHICH) $(UNZIP)))
  25 +
  26  ifdef CONCURRENCY
  27    EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
  28  endif
  29 @@ -641,7 +649,7 @@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OP
  30  JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
  31  JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
  32  # Boost the max memory for jtreg to avoid gc thrashing
  33 -JTREG_MEMORY_OPTION = -J-Xmx512m
  34 +JTREG_MEMORY_OPTION = -J-Xmx512m -J-XX:+UseSerialGC
  35  JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
  36
  37  # Make sure jtreg exists
  38 @@ -825,7 +833,7 @@ endif
  39
  40  # The jtjck.jar utility to use to run the tests
  41  JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar
  42 -JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx512m
  43 +JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx512m -XX:+UseSerialGC
  44  JTJCK_OPTIONS = -headless -v
  45
  46  # Default tests to run