Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Aug 2017 03:43:41 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r321967 - head/tests/sys/fs/tmpfs
Message-ID:  <201708030343.v733hfvg000491@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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'
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708030343.v733hfvg000491>