summaryrefslogtreecommitdiff
path: root/lang/openjdk8/patches/patch-jdk_test_Makefile
blob: 502ee6b0668aa305f544847a1601e5e26a2b4b9a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
$NetBSD: patch-jdk_test_Makefile,v 1.1 2015/02/08 08:41:25 tnn Exp $

Use tools from pkgsrc.

--- jdk/test/Makefile.orig	2015-02-02 15:37:13.000000000 +0000
+++ jdk/test/Makefile
@@ -56,6 +56,8 @@ UNAME     = uname
 UNIQ      = uniq
 WC        = wc
 ZIP       = zip
+UNZIP     = unzip
+WHICH     = which
 
 # Get OS name from uname (Cygwin inexplicably adds _NT-5.1)
 UNAME_S := $(shell $(UNAME) -s | $(CUT) -f1 -d_)
@@ -258,6 +260,12 @@ jdk_% core_% svc_%:
 
 # ------------------------------------------------------------------
 
+# carry over XAUTHORITY
+JTREG_TEST_OPTIONS += -e:XAUTHORITY
+
+# some tests expect to find zip and unzip on the path
+JTREG_TEST_OPTIONS += -e:PATH=/bin:/usr/bin:$(dir $(shell $(WHICH) $(ZIP))):$(dir $(shell $(WHICH) $(UNZIP)))
+
 ifdef CONCURRENCY
   EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
 endif