42 |
42 |
43 include $(WS_MAKE_RULES)/prep.mk |
43 include $(WS_MAKE_RULES)/prep.mk |
44 include $(WS_MAKE_RULES)/setup.py.mk |
44 include $(WS_MAKE_RULES)/setup.py.mk |
45 include $(WS_MAKE_RULES)/ips.mk |
45 include $(WS_MAKE_RULES)/ips.mk |
46 |
46 |
47 TEST_PYTHONPATH.32 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL |
|
48 TEST_PYTHONPATH.64 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL:$(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL/64 |
|
49 |
|
50 # This binary image file accompanies the test which is created along with a fix |
47 # This binary image file accompanies the test which is created along with a fix |
51 # in patches/04-CVE-2014-9601.patch |
48 # in patches/04-CVE-2014-9601.patch |
52 COMPONENT_PRE_TEST_ACTION= \ |
49 COMPONENT_PRE_TEST_ACTION= \ |
53 if [ ! -e $(SOURCE_DIR)/Images/png_decompression_dos.png ]; then \ |
50 if [ ! -e $(SOURCE_DIR)/Images/png_decompression_dos.png ]; then \ |
54 $(CP) files/png_decompression_dos.png \ |
51 $(CP) files/png_decompression_dos.png \ |
55 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
52 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
56 fi |
53 fi |
57 |
54 |
58 COMPONENT_TEST_DIR= $(COMPONENT_SRC) |
55 COMPONENT_TEST_DIR= $(COMPONENT_SRC) |
59 COMPONENT_TEST_ARGS= ./selftest.py |
56 COMPONENT_TEST_ARGS= ./selftest.py |
60 COMPONENT_TEST_ENV= PYTHONPATH=$(TEST_PYTHONPATH.$(BITS)) |
57 COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32) |
61 |
58 |
62 # 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, |
63 # for all versions of Python, so override |
60 # for all versions of Python, so override |
64 # here, rather than create multiple identical master files. |
61 # here, rather than create multiple identical master files. |
65 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master |
62 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master |
66 |
63 |
67 COMPONENT_TEST_TRANSFORMS += \ |
64 COMPONENT_TEST_TRANSFORMS += \ |
|
65 '-e "s|^PIL [0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}|PIL|" ' \ |
|
66 '-e "s|\(^Python modules loaded from \).*|\1|" ' \ |
68 '-e "s|\(^Binary modules loaded from \).*|\1|" ' |
67 '-e "s|\(^Binary modules loaded from \).*|\1|" ' |
|
68 |
|
69 # This binary image file accompanies the test which is created along with a fix |
|
70 # in patches/04-CVE-2014-9601.patch |
|
71 COMPONENT_PRE_SYSTEM_TEST_ACTION= \ |
|
72 if [ ! -e $(SOURCE_DIR)/Images/png_decompression_dos.png ]; then \ |
|
73 $(CP) files/png_decompression_dos.png \ |
|
74 $(SOURCE_DIR)/Images/png_decompression_dos.png ; \ |
|
75 fi |
|
76 COMPONENT_SYSTEM_TEST_DIR= $(COMPONENT_SRC) |
|
77 COMPONENT_SYSTEM_TEST_ARGS= ./selftest.py |
|
78 COMPONENT_SYSTEM_TEST_ENV= PYTHONPATH=$(PYTHON_VENDOR_PACKAGES.32) |
69 |
79 |
70 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
80 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
71 |
81 |
72 # common targets |
82 # common targets |
73 build: $(BUILD_32_and_64) |
83 build: $(BUILD_32_and_64) |
74 |
84 |
75 install: $(INSTALL_32_and_64) |
85 install: $(INSTALL_32_and_64) |
76 |
86 |
77 test: $(TEST_32_and_64) |
87 test: $(TEST_32_and_64) |
78 |
88 |
79 system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) |
89 system-test: $(SYSTEM_TEST_32_and_64) |
80 |
90 |
81 |
91 |
82 REQUIRED_PACKAGES += image/library/libjpeg |
92 REQUIRED_PACKAGES += image/library/libjpeg |
83 REQUIRED_PACKAGES += library/zlib |
93 REQUIRED_PACKAGES += library/zlib |
84 REQUIRED_PACKAGES += runtime/tcl-8 |
94 REQUIRED_PACKAGES += runtime/tcl-8 |