From owner-svn-src-all@freebsd.org  Sat Dec  3 03:15:10 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-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 C6B5AC60700;
 Sat,  3 Dec 2016 03:15:10 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 95CD0669;
 Sat,  3 Dec 2016 03:15:10 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB33F9Fb072429;
 Sat, 3 Dec 2016 03:15:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB33F99u072428;
 Sat, 3 Dec 2016 03:15:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201612030315.uB33F99u072428@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 3 Dec 2016 03:15:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r309473 - stable/11/contrib/netbsd-tests/games
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Dec 2016 03:15:10 -0000

Author: ngie
Date: Sat Dec  3 03:15:09 2016
New Revision: 309473
URL: https://svnweb.freebsd.org/changeset/base/309473

Log:
  MFC r309472:
  
  Restore pathing for factor(1), which unnecessarily diverged in r278616
  
  factor lives in /usr/games/, not /usr/bin, in NetBSD.
  
  The correct way to handle this is do on-the-fly manipulation of the test
  script via ATF_TESTS_SH_SED_<foo>, not by modify the pathing directly in
  the test script.
  
  This is being done to resolve an unnecessary conflict made when pulling
  back ^/head@r309469 (contrib/netbsd-tests update) to ^/stable/10.
  
  No functional change

Modified:
  stable/11/contrib/netbsd-tests/games/t_factor.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- stable/11/contrib/netbsd-tests/games/t_factor.sh	Sat Dec  3 03:13:32 2016	(r309472)
+++ stable/11/contrib/netbsd-tests/games/t_factor.sh	Sat Dec  3 03:15:09 2016	(r309473)
@@ -37,7 +37,7 @@ expect() {
 atf_test_case overflow1
 overflow1_head() {
 	atf_set "descr" "Tests for overflow conditions"
-	atf_set "require.progs" "/usr/bin/factor"
+	atf_set "require.progs" "/usr/games/factor"
 }
 overflow1_body() {
 	expect '8675309' '8675309: 8675309'
@@ -56,7 +56,7 @@ atf_test_case loop1
 loop1_head() {
 	atf_set "descr" "Tests some cases that once locked the program" \
 	                "in an infinite loop"
-	atf_set "require.progs" "/usr/bin/factor"
+	atf_set "require.progs" "/usr/games/factor"
 }
 loop1_body() {
 	expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'