components/runtime/openjdk-8/patches/0061-patch-jdk_test_Makefile.patch

   1 $NetBSD: patch-jdk_test_Makefile,v 1.1 2015/02/08 08:41:25 tnn Exp $
   2
   3 Use tools from pkgsrc.
   4
   5 --- jdk/test/Makefile.orig      2015-02-02 15:37:13.000000000 +0000
   6 +++ jdk/test/Makefile
   7 @@ -56,6 +56,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 (Cygwin inexplicably adds _NT-5.1)
  15  UNAME_S := $(shell $(UNAME) -s | $(CUT) -f1 -d_)
  16 @@ -258,6 +260,12 @@ jdk_% core_% svc_%:
  17
  18  # ------------------------------------------------------------------
  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