21357642 Hookup system-tests for nose
authorRich Burridge <rich.burridge@oracle.com>
Wed, 01 Jul 2015 14:07:24 -0700
changeset 4584 a5e61533b5ac
parent 4582 cfdc60640ff6
child 4585 86590f6eefcb
21357642 Hookup system-tests for nose
components/python/nose/Makefile
make-rules/setup.py.mk
--- a/components/python/nose/Makefile	Wed Jul 01 10:21:52 2015 -0700
+++ b/components/python/nose/Makefile	Wed Jul 01 14:07:24 2015 -0700
@@ -82,13 +82,17 @@
 COMPONENT_TEST_TRANSFORMER =	$(NAWK)
 COMPONENT_TEST_TRANSFORMS = "'/^ERROR: / { print }; /^Ran / { sub(\" tests in .+s\", \" tests in\"); print }; /^FAILED / { print }; /^OK / { print };'"
 
+COMPONENT_SYSTEM_TEST_DIR =	$(SOURCE_DIR)
+COMPONENT_SYSTEM_TEST_ENV =
+COMPONENT_SYSTEM_TEST_ARGS =	selftest.py
+
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
 test:		$(TEST_NO_ARCH)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    $(SYSTEM_TEST_NO_ARCH)
 
 REQUIRED_PACKAGES += library/python/setuptools-26
 REQUIRED_PACKAGES += library/python/setuptools-27
--- a/make-rules/setup.py.mk	Wed Jul 01 10:21:52 2015 -0700
+++ b/make-rules/setup.py.mk	Wed Jul 01 14:07:24 2015 -0700
@@ -50,6 +50,18 @@
 $(BUILD_DIR)/$(MACH32)-%/.tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH64)-%/.tested-and-compared:	BITS=64
 
+$(BUILD_DIR)/%-2.6/.system-tested:		PYTHON_VERSION=2.6
+$(BUILD_DIR)/%-2.7/.system-tested:		PYTHON_VERSION=2.7
+$(BUILD_DIR)/%-3.4/.system-tested:		PYTHON_VERSION=3.4
+$(BUILD_DIR)/$(MACH32)-%/.system-tested:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.system-tested:	BITS=64
+
+$(BUILD_DIR)/%-2.6/.system-tested-and-compared:		PYTHON_VERSION=2.6
+$(BUILD_DIR)/%-2.7/.system-tested-and-compared:		PYTHON_VERSION=2.7
+$(BUILD_DIR)/%-3.4/.system-tested-and-compared:		PYTHON_VERSION=3.4
+$(BUILD_DIR)/$(MACH32)-%/.system-tested-and-compared:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.system-tested-and-compared:	BITS=64
+
 BUILD_32 = $(PYTHON2_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.built)
 BUILD_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.built)
 BUILD_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.built)