From owner-svn-src-all@freebsd.org  Sat Jul 21 20:14:02 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 071A0102B4F5;
 Sat, 21 Jul 2018 20:14:02 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id A888676442;
 Sat, 21 Jul 2018 20:14:01 +0000 (UTC)
 (envelope-from asomers@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89BFD23B56;
 Sat, 21 Jul 2018 20:14:01 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6LKE1oE018821;
 Sat, 21 Jul 2018 20:14:01 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6LKE1xG018820;
 Sat, 21 Jul 2018 20:14:01 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201807212014.w6LKE1xG018820@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Sat, 21 Jul 2018 20:14:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336588 - head/tests/sys/fs/tmpfs
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/tests/sys/fs/tmpfs
X-SVN-Commit-Revision: 336588
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.27
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, 21 Jul 2018 20:14:02 -0000

Author: asomers
Date: Sat Jul 21 20:14:01 2018
New Revision: 336588
URL: https://svnweb.freebsd.org/changeset/base/336588

Log:
  Fix sys.fs.tmpfs.mknod_test.{char, block} by reverting r321967
  
  In r321967 ngie "fixed" these tests by changing their expectations to match
  the device numbers produced by the new ino64 code.  But it wasn't the tests
  that were broken, it was the kernel.  bde fixed the kernel in r335053.
  
  Reported by:	Jenkins
  MFC after:	Never (only applies to >= 12)

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

Modified: head/tests/sys/fs/tmpfs/Makefile
==============================================================================
--- head/tests/sys/fs/tmpfs/Makefile	Sat Jul 21 19:48:31 2018	(r336587)
+++ head/tests/sys/fs/tmpfs/Makefile	Sat Jul 21 20:14:01 2018	(r336588)
@@ -41,13 +41,7 @@ ${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'