From owner-svn-ports-all@freebsd.org Tue Sep 22 15:03:00 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 571F0A06028; Tue, 22 Sep 2015 15:03:00 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org (repo.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 2F9DC120B; Tue, 22 Sep 2015 15:03:00 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8MF30DU088937; Tue, 22 Sep 2015 15:03:00 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8MF30nL088936; Tue, 22 Sep 2015 15:03:00 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201509221503.t8MF30nL088936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Tue, 22 Sep 2015 15:03:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397542 - 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.20 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: Tue, 22 Sep 2015 15:03:00 -0000 Author: grembo Date: Tue Sep 22 15:02:59 2015 New Revision: 397542 URL: https://svnweb.freebsd.org/changeset/ports/397542 Log: Fix unit test in case hostname is not on a local interface PR: 201743 Approved by: mentors (implicit) Added: head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py (contents, props changed) Added: head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py Tue Sep 22 15:02:59 2015 (r397542) @@ -0,0 +1,38 @@ +--- cpp/test/Glacier2/staticFiltering/run.py.orig 2015-06-23 17:30:20.000000000 +0200 ++++ cpp/test/Glacier2/staticFiltering/run.py 2015-09-22 16:23:30.270288987 +0200 +@@ -8,7 +8,7 @@ + # + # ********************************************************************** + +-import os, sys, time, socket ++import os, sys, time, socket, subprocess + + path = [ ".", "..", "../..", "../../..", "../../../.." ] + head = os.path.dirname(sys.argv[0]) +@@ -99,12 +99,26 @@ + hostname = "127.0.0.1" + fqdn = "" + domainname = "" ++ ++ # Check if IP addresses are configured on a local interface ++ if TestUtil.isFreeBSD(): ++ p = subprocess.Popen("ifconfig", shell=1, stdout=subprocess.PIPE) ++ r = p.communicate()[0] ++ if r.find("inet " + testaddr1) == -1 or r.find("inet " + testaddr2) == 1: ++ print("Warning: Not all host IP addresses are available") ++ limitedTests = True ++ hostname = "127.0.0.1" ++ fqdn = "" ++ domainname = "" + except: + limitedTests = True + hostname = "127.0.0.1" + fqdn = "" + domainname = "" + ++if limitedTests: ++ print("Running limited tests") ++ + testcases = [ + ('testing category filter', + ('', '', '', 'foo "a cat with spaces"', '', ''),