author | Stephen Gaul Jr <steve.gaul@oracle.com> |
Fri, 24 Jun 2016 11:30:54 -0700 | |
changeset 6279 | b8986042dd84 |
parent 5682 | 94c0ca64c022 |
child 7687 | 1093e2a9adbd |
permissions | -rw-r--r-- |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# CDDL HEADER START |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
# The contents of this file are subject to the terms of the |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
# Common Development and Distribution License (the "License"). |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
# You may not use this file except in compliance with the License. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
# or http://www.opensolaris.org/os/licensing. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
# See the License for the specific language governing permissions |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
# and limitations under the License. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
# When distributing Covered Code, include this CDDL HEADER in each |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
# If applicable, add the following below this CDDL HEADER, with the |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
# fields enclosed by brackets "[]" replaced with your own identifying |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
# CDDL HEADER END |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
# |
5555
192cd077bf22
22853968 Update conflict to version 20150705
Rich Burridge <rich.burridge@oracle.com>
parents:
5125
diff
changeset
|
23 |
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
# |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5555
diff
changeset
|
25 |
BUILD_BITS= 64 |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
include ../../make-rules/shared-macros.mk |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
COMPONENT_NAME= conflict |
5555
192cd077bf22
22853968 Update conflict to version 20150705
Rich Burridge <rich.burridge@oracle.com>
parents:
5125
diff
changeset
|
29 |
COMPONENT_VERSION= 20150705 |
192cd077bf22
22853968 Update conflict to version 20150705
Rich Burridge <rich.burridge@oracle.com>
parents:
5125
diff
changeset
|
30 |
IPS_COMPONENT_VERSION= 0.2015.7.5 |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
COMPONENT_PROJECT_URL= http://invisible-island.net/conflict/conflict.html |
800
2ad056ed89ec
7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
771
diff
changeset
|
33 |
COMPONENT_ARCHIVE_HASH= \ |
5555
192cd077bf22
22853968 Update conflict to version 20150705
Rich Burridge <rich.burridge@oracle.com>
parents:
5125
diff
changeset
|
34 |
sha256:30e14808768a938df139a1b76f8f7397e1b3bf46a18ceabcc8b1b1a70d5ea8a9 |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
COMPONENT_ARCHIVE_URL= ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
|
5555
192cd077bf22
22853968 Update conflict to version 20150705
Rich Burridge <rich.burridge@oracle.com>
parents:
5125
diff
changeset
|
37 |
TPNO= 27130 |
1948
2d1537e7942d
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests
John Beck <John.Beck@Oracle.COM>
parents:
1232
diff
changeset
|
38 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5555
diff
changeset
|
39 |
# We really do need to build conflict so that it can use the files in the |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5555
diff
changeset
|
40 |
# build directory. We are using the installed conflict binary to do this |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5555
diff
changeset
|
41 |
# though when we run the system tests. |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5555
diff
changeset
|
42 |
SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_64) |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5555
diff
changeset
|
43 |
include $(WS_MAKE_RULES)/common.mk |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
44 |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
45 |
# Required to configure correctly. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
46 |
COMPONENT_PRE_CONFIGURE_ACTION = \ |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
47 |
($(CLONEY) $(SOURCE_DIR) $(@D)) |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
48 |
|
2164
b580bc10e31a
19824924 Various Userland component test: Makefile targets should be standardized
Rich Burridge <rich.burridge@oracle.com>
parents:
1948
diff
changeset
|
49 |
COMPONENT_TEST_DIR = $(BUILD_DIR_64) |
b580bc10e31a
19824924 Various Userland component test: Makefile targets should be standardized
Rich Burridge <rich.burridge@oracle.com>
parents:
1948
diff
changeset
|
50 |
COMPONENT_TEST_CMD = ./run_test.sh |
b580bc10e31a
19824924 Various Userland component test: Makefile targets should be standardized
Rich Burridge <rich.burridge@oracle.com>
parents:
1948
diff
changeset
|
51 |
COMPONENT_TEST_TARGETS = |
b580bc10e31a
19824924 Various Userland component test: Makefile targets should be standardized
Rich Burridge <rich.burridge@oracle.com>
parents:
1948
diff
changeset
|
52 |
|
3597
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
2225
diff
changeset
|
53 |
# The additional conflict specific set of transforms to be applied to the |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
2225
diff
changeset
|
54 |
# test results to try to normalize them. |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
2225
diff
changeset
|
55 |
COMPONENT_TEST_TRANSFORMS += \ |
4747
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
56 |
'-e "s|/tmp/conflict\.......|/tmp/conflict\.xxxxxx|g" ' \ |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
57 |
'-e "s|^\*\* \$$(@D)/.*$$|XXX_CC_XXX|g" ' \ |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
58 |
'-e "s|^\*\* /usr/bin/.*$$|XXX_CC_XXX|g" ' \ |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
59 |
'-e "/^XXX_CC_XXX$$/d" ' |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
60 |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
61 |
COMPONENT_SYSTEM_TEST_DIR = $(BUILD_DIR_64) |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
62 |
COMPONENT_SYSTEM_TEST_ENV = CONFLICT_BIN=/usr/bin/conflict |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
63 |
COMPONENT_SYSTEM_TEST_CMD = ./run_test.sh |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
4339
diff
changeset
|
64 |
COMPONENT_SYSTEM_TEST_TARGETS = |