svn commit: r382009 - in head/devel/ice: . files

[Michael Gmelin]

Author: grembo
Date: Mon Mar 23 15:28:05 2015
New Revision: 382009
URL: https://svnweb.freebsd.org/changeset/ports/382009
QAT: https://qat.redports.org/buildarchive/r382009/

Log:
  Make sure that failed unit tests lead to failed builds.
  
  Fix the unit test python script provided upstream [1] and
  move running the unit test to the pre-install target.
  
  [1] https://zeroc.com/forums/patches/6416-ice-3-5-1-small-patch-testutil-py.html
  
  Approved by:	mentors (implicit)

Modified:
  head/devel/ice/Makefile
  head/devel/ice/files/patch-scripts-TestUtil.py

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Mon Mar 23 15:21:07 2015	(r382008)
+++ head/devel/ice/Makefile	Mon Mar 23 15:28:05 2015	(r382009)
@@ -135,10 +135,10 @@ post-patch:
 
 .if ${PORT_OPTIONS:MTESTS}
 TEST_CMD=		@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
-post-build:
-	${TEST_CMD}
-regression-test test: build
+check regression-test test: build
 	${TEST_CMD}
+
+pre-install: regression-test
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/ice/files/patch-scripts-TestUtil.py
==============================================================================
--- head/devel/ice/files/patch-scripts-TestUtil.py	Mon Mar 23 15:21:07 2015	(r382008)
+++ head/devel/ice/files/patch-scripts-TestUtil.py	Mon Mar 23 15:28:05 2015	(r382009)
@@ -1,5 +1,5 @@
 --- scripts.orig/TestUtil.py	2013-03-11 15:19:47.000000000 +0000
-+++ scripts/TestUtil.py	2013-05-21 00:29:37.903194948 +0000
++++ scripts/TestUtil.py	2015-03-23 14:08:57.225102620 +0000
 @@ -84,6 +84,25 @@
  def isLinux():
      return sys.platform.startswith("linux")
@@ -41,3 +41,12 @@
              if not isWin32() and "win32only" in config:
                  print("%s*** test only supported under Win32%s" % (prefix, suffix))
                  continue
+@@ -1929,7 +1929,7 @@
+                     print("  exit 1")
+                 print("fi")
+             else:
+-                status = os.system(sys.executable + " " +  quoteArgument(os.path.join(dir, "run.py")) + " " + args)
++                status = os.system(sys.executable + " " +  quoteArgument(os.path.join(dir, "run.py")) + " " + args) >> 8
+ 
+                 if status:
+                     if(num > 0):