From owner-svn-src-all@freebsd.org  Thu Aug  3 03:43:42 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 E3756DC69A2;
 Thu,  3 Aug 2017 03:43:42 +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 B156464ACC;
 Thu,  3 Aug 2017 03:43:42 +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 v733hfLP000492;
 Thu, 3 Aug 2017 03:43:41 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v733hfvg000491;
 Thu, 3 Aug 2017 03:43:41 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708030343.v733hfvg000491@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: Thu, 3 Aug 2017 03:43:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321967 - head/tests/sys/fs/tmpfs
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/tests/sys/fs/tmpfs
X-SVN-Commit-Revision: 321967
X-SVN-Commit-Repository: base
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: Thu, 03 Aug 2017 03:43:43 -0000

Author: ngie
Date: Thu Aug  3 03:43:41 2017
New Revision: 321967
URL: https://svnweb.freebsd.org/changeset/base/321967

Log:
  Chase r321920 and r321930 (dev_t being widened)
  
  The layout of st_rdev has changed after this commit, and assumptions made
  in the NetBSD tests are no longer valid. Change the hardcoded assumed
  values to account for the fact that major/minor are now represented by
  64 bits as opposed to the less precise legacy precision of 16 bits.
  
  PR:	221048
  Relnotes: st_rdev layout changed; warning about impact of r321920 to
  	  downstream consumers

Modified:
  head/tests/sys/fs/tmpfs/Makefile

Modified: head/tests/sys/fs/tmpfs/Makefile
==============================================================================
--- head/tests/sys/fs/tmpfs/Makefile	Thu Aug  3 02:08:01 2017	(r321966)
+++ head/tests/sys/fs/tmpfs/Makefile	Thu Aug  3 03:43:41 2017	(r321967)
@@ -41,7 +41,13 @@ ${PACKAGE}FILESDIR=	${TESTSDIR}
 PROGS+=			h_tools
 BINDIR.h_tools=		${TESTSDIR}
 
+# NOTE: dev_t is represented by 64-bits after r321920 (it was 16-bits
+# previously).
+#
+# The old hardcoded values assume the 16-bit layout for <struct stat>.st_rdev .
 ATF_TESTS_SH_SED_mknod_test=		\
+					-e '/$${st_rdev} -eq 512/s/512/8589934592/g' \
+					-e '/$${st_rdev} -eq 514/s/514/8589934594/g' \
 					-e 's,mknod pipe p,mkfifo pipe,g' \
 					-e 's,mknod dir/pipe p,mkfifo dir/pipe,g'