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/simplejson/Makefile |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/components/python/simplejson/Makefile b/components/python/simplejson/Makefile
index 36decb8..e90cc53 100644
--- a/components/python/simplejson/Makefile
+++ b/components/python/simplejson/Makefile
@@ -39,12 +39,17 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+COMPONENT_TEST_DIR= $(COMPONENT_SRC) 
+COMPONENT_TEST_ARGS= ./setup.py test
+
+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