equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 include ../../../make-rules/shared-macros.mk |
25 include ../../../make-rules/shared-macros.mk |
26 |
26 |
27 COMPONENT_NAME= pyOpenSSL |
27 COMPONENT_NAME= pyOpenSSL |
28 COMPONENT_VERSION= 0.13 |
28 COMPONENT_VERSION= 0.13 |
41 include $(WS_MAKE_RULES)/ips.mk |
41 include $(WS_MAKE_RULES)/ips.mk |
42 |
42 |
43 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
43 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
44 |
44 |
45 COMPONENT_TEST_DIR = $(COMPONENT_SRC)/OpenSSL/test |
45 COMPONENT_TEST_DIR = $(COMPONENT_SRC)/OpenSSL/test |
46 COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES) |
46 # The .so files are under ./OpenSSL/64 not ./64/OpenSSL so the |
|
47 # $(PYTHON_VENDOR_PACKAGES) variable for 64bit Python is wrong. |
|
48 # Everything works fine if we just add the 32bit path. |
|
49 COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32) |
47 COMPONENT_TEST_CMD = $(SHELL) |
50 COMPONENT_TEST_CMD = $(SHELL) |
48 COMPONENT_TEST_ARGS = $(COMPONENT_DIR)/files/runtests |
51 COMPONENT_TEST_ARGS = $(COMPONENT_DIR)/files/runtests |
49 |
52 |
50 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master |
53 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master |
51 |
54 |