From owner-svn-ports-all@FreeBSD.ORG Mon Mar 23 15:28:07 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16F55A8A; Mon, 23 Mar 2015 15:28:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC20CD36; Mon, 23 Mar 2015 15:28:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NFS6gm036193; Mon, 23 Mar 2015 15:28:06 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NFS6v2036189; Mon, 23 Mar 2015 15:28:06 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201503231528.t2NFS6v2036189@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Mon, 23 Mar 2015 15:28:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382009 - in head/devel/ice: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2015 15:28:07 -0000 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 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):