head 1.6; access; symbols pkgsrc-2020Q1:1.5.0.22 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.44 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.40 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.38 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.36 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.34 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.32 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.30 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.28 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.26 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.24 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.20 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.18 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.16 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.14 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.12 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.10 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.8 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.6 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.4 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.2 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.3.0.4 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.2 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.2.0.4 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.2 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.1.0.6 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.4 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.2 pkgsrc-2013Q2-base:1.1; locks; strict; comment @# @; 1.6 date 2020.05.17.00.47.06; author tnn; state dead; branches; next 1.5; commitid by06jUrXKAUzQw8C; 1.5 date 2015.03.02.03.53.26; author tnn; state Exp; branches; next 1.4; commitid EXGSR4O4Qqkx2Zby; 1.4 date 2015.02.09.00.42.17; author tnn; state Exp; branches; next 1.3; commitid SZIwjRoVn6uEEg9y; 1.3 date 2014.09.13.14.35.25; author joerg; state Exp; branches; next 1.2; commitid sMigAY6fTj443cQx; 1.2 date 2014.01.20.19.25.11; author joerg; state Exp; branches; next 1.1; commitid hyhhw8fFtwLNfTlx; 1.1 date 2013.06.15.09.31.06; author jperkin; state Exp; branches; next ; commitid gr72iqj6cRdUZGTw; desc @@ 1.6 log @retire lang/openjdk7 @ text @$NetBSD: patch-jdk_test_Makefile,v 1.5 2015/03/02 03:53:26 tnn Exp $ Use tools from pkgsrc. --- jdk/test/Makefile.orig 2014-01-01 05:53:43.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) @@@@ -381,6 +383,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 @ 1.5 log @- put -D__STDC_LIMIT_MACROS on command line instead of patching it everywhere - don't use ALT_JDK_IMPORT_PATH on SunOS, just build like on other platforms - regen all bootstraps to facilitate removal of the +UseSerialGC hacks - bootstrap binaries on FTP are now PGP signed - remove a handful of obsolete patches @ text @d1 1 a1 1 $NetBSD: patch-jdk_test_Makefile,v 1.4 2015/02/09 00:42:17 tnn Exp $ @ 1.4 log @Clean up +UseSerialGC handling and ensure it is set for the entire build. (has anyone analyzed the concurrent GC memory allocation problem?) Bump PKGREVISION for this and previous changes. @ text @d1 1 a1 1 $NetBSD: patch-jdk_test_Makefile,v 1.3 2014/09/13 14:35:25 joerg Exp $ a28 18 @@@@ -641,7 +649,7 @@@@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OP JTREG_TIMEOUT_OPTION = -timeoutFactor:4 JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) # Boost the max memory for jtreg to avoid gc thrashing -JTREG_MEMORY_OPTION = -J-Xmx512m +JTREG_MEMORY_OPTION = $(PKGSRC_BOOT_JDK_TOOLARGS) JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) # Make sure jtreg exists @@@@ -825,7 +833,7 @@@@ endif # The jtjck.jar utility to use to run the tests JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar -JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m +JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m $(PKGSRC_BOOT_JDK_JVMARGS) JTJCK_OPTIONS = -headless -v # Default tests to run @ 1.3 log @Only add -lgcc_s explicitly on NetBSD 5. Disable parallel GC in rules.make and explicitly on calls to ant. Be nice and raise the memory limit to 1G. Adjust ant rules to also apply SerialGC + 1G limit. This currently reverts to the default settings for !BSD, if necessary the changes to rules.make should be copied. Add a small fragment for providing lang/openjdk7/libs with compat versions of libstdc++ and libgcc_s to allow using the GCC bootstrap in a pure clang release. Versions can be obtained from NetBSD 6's base.tgz. @ text @d1 1 a1 1 $NetBSD: patch-jdk_test_Makefile,v 1.2 2014/01/20 19:25:11 joerg Exp $ d34 1 a34 1 +JTREG_MEMORY_OPTION = -J-Xmx512m -J-XX:+UseSerialGC d43 1 a43 1 +JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx1024m -XX:+UseSerialGC @ 1.2 log @Force serial GC during build. Fix friend forward with default arguments. Fix incorrect return value. @ text @d1 1 a1 1 $NetBSD: patch-jdk_test_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ d43 1 a43 1 +JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m -XX:+UseSerialGC @ 1.1 log @Add SunOS/GCC support. With huge thanks to "jesse" from #SmartOS who did the bulk of the porting work. Tested on SmartOS 32-bit. 64-bit builds currently fail, they should hopefully be fixed soon. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- jdk/test/Makefile.orig 2013-02-20 17:07:30.000000000 +0000 d16 1 a16 1 @@@@ -376,6 +378,12 @@@@ else d29 18 @