From owner-svn-src-all@freebsd.org  Sun Jun  4 02:21:39 2017
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 4F7DEAF8764;
 Sun,  4 Jun 2017 02:21:39 +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 1E58AD79;
 Sun,  4 Jun 2017 02:21:39 +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 v542Lcax051832;
 Sun, 4 Jun 2017 02:21:38 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v542LcYS051831;
 Sun, 4 Jun 2017 02:21:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201706040221.v542LcYS051831@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: Sun, 4 Jun 2017 02:21:38 +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: r319560 - stable/11/usr.bin/mkimg/tests
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: Sun, 04 Jun 2017 02:21:39 -0000

Author: ngie
Date: Sun Jun  4 02:21:38 2017
New Revision: 319560
URL: https://svnweb.freebsd.org/changeset/base/319560

Log:
  MFC r319294:
  
  Approved by:	re (gjb)
  
  Fix "make rebase" after ^/head@r315776
  
  "make rebase" can be used for rebasing the output files from mkimg
  after making a change to mkimg. This will come in handy soon, per
  bug 219673.

Modified:
  stable/11/usr.bin/mkimg/tests/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/mkimg/tests/Makefile
==============================================================================
--- stable/11/usr.bin/mkimg/tests/Makefile	Sat Jun  3 23:13:46 2017	(r319559)
+++ stable/11/usr.bin/mkimg/tests/Makefile	Sun Jun  4 02:21:38 2017	(r319560)
@@ -2,7 +2,8 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	mkimg_test
+_REBASE_SCRIPT=	mkimg_test
+ATF_TESTS_SH=	${_REBASE_SCRIPT}
 
 SOURCES!=	cd ${.CURDIR}; echo *.uu
 ${PACKAGE}FILES+=		${SOURCES:S,.gz.uu,,g}
@@ -12,7 +13,7 @@ ${${PACKAGE}FILES}:
 
 CLEANFILES+=	${${PACKAGE}FILES}}
 
-rebase:
-	(cd ${.CURDIR}; atf-sh mkimg.sh rebase)
+rebase: .PHONY
+	(cd ${.CURDIR}; atf-sh ${_REBASE_SCRIPT}.sh rebase)
 
 .include <bsd.test.mk>