equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 include ../../../make-rules/shared-macros.mk |
26 include ../../../make-rules/shared-macros.mk |
27 |
27 |
28 COMPONENT_NAME= Imaging |
28 COMPONENT_NAME= Imaging |
52 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
52 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
53 fi |
53 fi |
54 |
54 |
55 COMPONENT_TEST_DIR= $(COMPONENT_SRC) |
55 COMPONENT_TEST_DIR= $(COMPONENT_SRC) |
56 COMPONENT_TEST_ARGS= ./selftest.py |
56 COMPONENT_TEST_ARGS= ./selftest.py |
57 COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES) |
57 COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32) |
58 |
58 |
59 # Master test results are the same for both 32-bit and 64-bit, |
59 # Master test results are the same for both 32-bit and 64-bit, |
60 # for all versions of Python, so override |
60 # for all versions of Python, so override |
61 # here, rather than create multiple identical master files. |
61 # here, rather than create multiple identical master files. |
62 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master |
62 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master |
73 $(CP) files/png_decompression_dos.png \ |
73 $(CP) files/png_decompression_dos.png \ |
74 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
74 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
75 fi |
75 fi |
76 COMPONENT_SYSTEM_TEST_DIR= $(COMPONENT_SRC) |
76 COMPONENT_SYSTEM_TEST_DIR= $(COMPONENT_SRC) |
77 COMPONENT_SYSTEM_TEST_ARGS= ./selftest.py |
77 COMPONENT_SYSTEM_TEST_ARGS= ./selftest.py |
78 COMPONENT_SYSTEM_TEST_ENV= PYTHONPATH=$(PYTHON_VENDOR_PACKAGES) |
78 COMPONENT_SYSTEM_TEST_ENV= PYTHONPATH=$(PYTHON_VENDOR_PACKAGES.32) |
79 |
79 |
80 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
80 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
81 |
81 |
82 # common targets |
82 # common targets |
83 build: $(BUILD_32_and_64) |
83 build: $(BUILD_32_and_64) |