author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Sat, 14 Jan 2017 13:51:41 -0800 | |
changeset 7578 | 0d6f61408e89 |
parent 5682 | 94c0ca64c022 |
child 7687 | 1093e2a9adbd |
permissions | -rw-r--r-- |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
1 |
# |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
2 |
# CDDL HEADER START |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
3 |
# |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
4 |
# The contents of this file are subject to the terms of the |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
5 |
# Common Development and Distribution License (the "License"). |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
6 |
# You may not use this file except in compliance with the License. |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
7 |
# |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
8 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
9 |
# or http://www.opensolaris.org/os/licensing. |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
10 |
# See the License for the specific language governing permissions |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
11 |
# and limitations under the License. |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
12 |
# |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
13 |
# When distributing Covered Code, include this CDDL HEADER in each |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
14 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
15 |
# If applicable, add the following below this CDDL HEADER, with the |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
16 |
# fields enclosed by brackets "[]" replaced with your own identifying |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
17 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
18 |
# |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
19 |
# CDDL HEADER END |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
20 |
# |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
21 |
|
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
22 |
# |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
23 |
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
24 |
# |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
25 |
BUILD_BITS= 32 |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
26 |
include ../../make-rules/shared-macros.mk |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
27 |
|
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
28 |
COMPONENT_NAME= junit |
1178
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
29 |
COMPONENT_VERSION= 4.11 |
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
30 |
COMPONENT_PROJECT_URL= https://github.com/junit-team/junit/archive |
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
31 |
COMPONENT_SRC= $(COMPONENT_NAME)-r$(COMPONENT_VERSION) |
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
32 |
COMPONENT_ARCHIVE= r$(COMPONENT_VERSION).zip |
800
2ad056ed89ec
7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
772
diff
changeset
|
33 |
COMPONENT_ARCHIVE_HASH= \ |
1178
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
34 |
sha256:3048cb3f2b07fada9d85b2c042bbedb93892ef70c1dcfe0594124850418f9ffb |
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
35 |
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/$(COMPONENT_ARCHIVE) |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
36 |
|
2036
3bb5e6819aea
19078514 junit version 4.11 needs a TPNO in the fullness of time
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1434
diff
changeset
|
37 |
TPNO= 9070 |
3bb5e6819aea
19078514 junit version 4.11 needs a TPNO in the fullness of time
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1434
diff
changeset
|
38 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
39 |
BUILD_STYLE= ant |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
40 |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
41 |
# Another test is: |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
42 |
# To test after you have installed the resulting package do: |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
43 |
# $ java -cp /usr/share/lib/java/junit.jar:/usr/share/doc/junit/samples/org \ |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
44 |
# junit/samples/money/MoneyTest |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
45 |
# ...................... |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
46 |
# Time: 0.003 |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
47 |
# |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
48 |
# OK (22 tests) |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
49 |
SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_32) |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
50 |
include $(WS_MAKE_RULES)/common.mk |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
51 |
|
1178
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
52 |
# These ARGS override what is set in build.xml |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
53 |
COMPONENT_BUILD_ARGS += -Ddist=${PROTO_DIR} |
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
54 |
COMPONENT_BUILD_ARGS += -Djavadocdir=${PROTO_DIR} |
1178
640a1a5dcf77
15998720 junit randomly fails a test with jdk 1.7
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1165
diff
changeset
|
55 |
COMPONENT_BUILD_ARGS += -Dversion-status="" |
4197
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
3959
diff
changeset
|
56 |
COMPONENT_BUILD_ARGS += -Dadditionalparam="-Xdoclint:none" |
4700
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
57 |
COMPONENT_BUILD_TARGETS = populate-dist |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
58 |
|
5146
c60fe986692f
17329146 junit build leaves crud in /var/tmp
Rich Burridge <rich.burridge@oracle.com>
parents:
4700
diff
changeset
|
59 |
COMPONENT_PRE_BUILD_ACTION = $(MKDIR) $(@D)/tmp |
c60fe986692f
17329146 junit build leaves crud in /var/tmp
Rich Burridge <rich.burridge@oracle.com>
parents:
4700
diff
changeset
|
60 |
COMPONENT_BUILD_ENV += "_JAVA_OPTIONS=-Djava.io.tmpdir=$(BUILD_DIR_32)/tmp" |
c60fe986692f
17329146 junit build leaves crud in /var/tmp
Rich Burridge <rich.burridge@oracle.com>
parents:
4700
diff
changeset
|
61 |
|
4700
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
62 |
# We patched in test-build into build.xml which is a copy of |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
63 |
# dist but without the depends=populate-dist |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
64 |
# because userland infrasture will handle the build and we |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
65 |
# need to build tests which are also part of the overall softare build. |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
66 |
COMPONENT_TEST_ARGS += $(COMPONENT_BUILD_ARGS) |
5146
c60fe986692f
17329146 junit build leaves crud in /var/tmp
Rich Burridge <rich.burridge@oracle.com>
parents:
4700
diff
changeset
|
67 |
COMPONENT_TEST_ENV += "_JAVA_OPTIONS=-Djava.io.tmpdir=$(BUILD_DIR_32)/tmp" |
4700
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
68 |
COMPONENT_TEST_TARGETS = test-build |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
69 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5146
diff
changeset
|
70 |
COMPONENT_SYSTEM_TEST_ARGS += -Dsystem-binjar=$(USRSHARELIBDIR)/java/$(COMPONENT_NAME).jar |
5146
c60fe986692f
17329146 junit build leaves crud in /var/tmp
Rich Burridge <rich.burridge@oracle.com>
parents:
4700
diff
changeset
|
71 |
COMPONENT_SYSTEM_TEST_ENV += "_JAVA_OPTIONS=-Djava.io.tmpdir=$(BUILD_DIR_32)/tmp" |
4700
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
72 |
COMPONENT_SYSTEM_TEST_TARGETS = test |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
73 |
|
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
74 |
# Test transforms |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
75 |
# remove everything upto "test" which is build noise |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
76 |
# remove time |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
77 |
COMPONENT_TEST_TRANSFORMS += \ |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
78 |
'-e "1,/^test/d"' \ |
3e0131debf7c
20217156 junit should have its tests hooked up in the Makefile
Craig Mohrman <craig.mohrman@oracle.com>
parents:
4339
diff
changeset
|
79 |
'-e "s/.*[Tt]ime.*$$//"' |
318
3ed992b12a6c
7054498 Move JUnit to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
80 |
|
4197
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
3959
diff
changeset
|
81 |
REQUIRED_PACKAGES += runtime/java/jre-8 |