[csw-devel] SF.net SVN: gar:[21680] csw/mgar/gar/v2

[pfelecan at users.sourceforge.net]

Revision: 21680
          http://gar.svn.sourceforge.net/gar/?rev=21680&view=rev
Author:   pfelecan
Date:     2013-08-09 12:33:45 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
gar/v2: the target command for setup.py change from test to check in 2.7 and subsequent

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/python/category.mk
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.lib.mk

Modified: csw/mgar/gar/v2/categories/python/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/python/category.mk	2013-08-09 12:08:28 UTC (rev 21679)
+++ csw/mgar/gar/v2/categories/python/category.mk	2013-08-09 12:33:45 UTC (rev 21680)
@@ -49,7 +49,8 @@
 
 include gar/gar.mk
 
-# TODO: how can we transform this in SUN and GNU respectively?
+# TODO: how can we transform this in SUN and GNU respectively? note
+# that it's to early(?) to use the generic name
 GARCOMPILER_PYTHON_2_6 = SOS12U3
 GARCOMPILER_PYTHON_2_7 = GCC4
 GARCOMPILER = $(GARCOMPILER_PYTHON_$(PYTHON_VERSION))

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2013-08-09 12:08:28 UTC (rev 21679)
+++ csw/mgar/gar/v2/gar.conf.mk	2013-08-09 12:33:45 UTC (rev 21680)
@@ -894,6 +894,11 @@
 PYTHON_MODULE_PACKAGE_PREFIX_3_3 = CSWpy33-
 PYTHON_MODULE_PACKAGE_PREFIX = $(PYTHON_MODULE_PACKAGE_PREFIX_$(PYTHON_VERSION))
 
+PYTHON_TEST_TARGET_2_6	=	test
+PYTHON_TEST_TARGET_2_7	=	check
+PYTHON_TEST_TARGET_3_3	=	check
+PYTHON_TEST_TARGET		=	$(PYTHON_TEST_TARGET_$(PYTHON_VERSION))
+
 # Global environment
 export PATH PKG_CONFIG_PATH
 

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2013-08-09 12:08:28 UTC (rev 21679)
+++ csw/mgar/gar/v2/gar.lib.mk	2013-08-09 12:33:45 UTC (rev 21680)
@@ -988,7 +988,7 @@
 test-%/setup.py:
 	@echo " ==> Running setup.py test in $*"
 	@( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) )
-	@( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) $(PYTHON_EXECUTABLE) ./setup.py test $(TEST_ARGS) )
+	@( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) $(PYTHON_EXECUTABLE) ./setup.py $(PYTHON_TEST_TARGET) $(TEST_ARGS) )
 	@$(MAKECOOKIE)
 
 ################# INSTALL RULES ####################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.