blob: 7c03b4c7741bfd15e55dbf8239921547669da47e (
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 2013/06/15 09:31:06 jperkin Exp $
Use tools from pkgsrc.
--- jdk/test/Makefile.orig 2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/Makefile
@@ -54,6 +54,8 @@ UNAME = uname
UNIQ = uniq
WC = wc
ZIP = zip
+UNZIP = unzip
+WHICH = which
# Get OS name from uname
UNAME_S := $(shell $(UNAME) -s)
@@ -376,6 +378,12 @@ else
JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
endif
+# 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
|
