From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001 From: Andrzej Szeszo <aszeszo@gmail.com> Date: Tue, 04 Jun 2013 12:32:37 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster --- components/python/imaging/Makefile | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/components/python/imaging/Makefile b/components/python/imaging/Makefile index ab6b359..fb6a103 100644 --- a/components/python/imaging/Makefile +++ b/components/python/imaging/Makefile @@ -39,12 +39,21 @@ include $(WS_TOP)/make-rules/setup.py.mk include $(WS_TOP)/make-rules/ips.mk +TEST_PYTHONPATH.32 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL +TEST_PYTHONPATH.64 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL:$(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL/64 + +COMPONENT_TEST_DIR= $(COMPONENT_SRC) +COMPONENT_TEST_ARGS= ./selftest.py +COMPONENT_TEST_ENV= PYTHONPATH=$(TEST_PYTHONPATH.$(BITS)) + +ASLR_MODE = $(ASLR_ENABLE) + # common targets build: $(BUILD_32_and_64) install: $(INSTALL_32_and_64) -test: $(NO_TESTS) +test: $(TEST_32_and_64) BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -- Gitblit v1.9.3