From owner-svn-src-all@freebsd.org Mon Apr 29 19:09:45 2019 Return-Path: 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 C13FD1599E94; Mon, 29 Apr 2019 19:09:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6795C6BBA2; Mon, 29 Apr 2019 19:09:45 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CA5B2646C; Mon, 29 Apr 2019 19:09:45 +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 x3TJ9jjA061961; Mon, 29 Apr 2019 19:09:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3TJ9jk6061960; Mon, 29 Apr 2019 19:09:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904291909.x3TJ9jk6061960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Mon, 29 Apr 2019 19:09:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r346909 - stable/12/tests/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: stable/12/tests/sys/kern X-SVN-Commit-Revision: 346909 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6795C6BBA2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Apr 2019 19:09:45 -0000 Author: ngie Date: Mon Apr 29 19:09:44 2019 New Revision: 346909 URL: https://svnweb.freebsd.org/changeset/base/346909 Log: MFC r346542: Fix sys.kern.coredump_phnum_test.coredump_phnum on i386 The zero-padding when printing out the Size field is on 32-bit architectures is 5, not 15. Adjust the regular expression to work with both the 32-bit and 64-bit case. Modified: stable/12/tests/sys/kern/coredump_phnum_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/tests/sys/kern/coredump_phnum_test.sh ============================================================================== --- stable/12/tests/sys/kern/coredump_phnum_test.sh Mon Apr 29 18:56:39 2019 (r346908) +++ stable/12/tests/sys/kern/coredump_phnum_test.sh Mon Apr 29 19:09:44 2019 (r346909) @@ -65,7 +65,7 @@ EOF -x 'readelf -h coredump_phnum_helper.core | grep "Number of program headers:"' atf_check -o "match:There are 66[0-9]{3} program headers" \ -x 'readelf -l coredump_phnum_helper.core | grep -1 "program headers"' - atf_check -o "match: 0000000000000001 .* 66[0-9]{3} " \ + atf_check -o "match: 00000(0000000000)?1 .* 66[0-9]{3} " \ -x 'readelf -S coredump_phnum_helper.core | grep -A1 "^ \[ 0\] "' atf_check -o "match:66[0-9]{3}" \