From owner-svn-src-all@freebsd.org Thu May 30 15:20:21 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 C4C4F15C5405; Thu, 30 May 2019 15:20:21 +0000 (UTC) (envelope-from markj@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 6BF498FDE1; Thu, 30 May 2019 15:20:21 +0000 (UTC) (envelope-from markj@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 446E01ADBA; Thu, 30 May 2019 15:20:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4UFKLSD025631; Thu, 30 May 2019 15:20:21 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4UFKKG0025628; Thu, 30 May 2019 15:20:20 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201905301520.x4UFKKG0025628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 30 May 2019 15:20:20 +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: r348428 - in stable/12: cddl/usr.sbin/dtrace/tests cddl/usr.sbin/dtrace/tests/i386 cddl/usr.sbin/dtrace/tests/tools etc/mtree X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12: cddl/usr.sbin/dtrace/tests cddl/usr.sbin/dtrace/tests/i386 cddl/usr.sbin/dtrace/tests/tools etc/mtree X-SVN-Commit-Revision: 348428 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6BF498FDE1 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_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Thu, 30 May 2019 15:20:22 -0000 Author: markj Date: Thu May 30 15:20:20 2019 New Revision: 348428 URL: https://svnweb.freebsd.org/changeset/base/348428 Log: MFC r348080, r348081: Add platform-dependent DTrace tests. Added: stable/12/cddl/usr.sbin/dtrace/tests/i386/ - copied from r348081, head/cddl/usr.sbin/dtrace/tests/i386/ Modified: stable/12/cddl/usr.sbin/dtrace/tests/Makefile stable/12/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh stable/12/etc/mtree/BSD.tests.dist Directory Properties: stable/12/ (props changed) Modified: stable/12/cddl/usr.sbin/dtrace/tests/Makefile ============================================================================== --- stable/12/cddl/usr.sbin/dtrace/tests/Makefile Thu May 30 15:17:35 2019 (r348427) +++ stable/12/cddl/usr.sbin/dtrace/tests/Makefile Thu May 30 15:20:20 2019 (r348428) @@ -4,6 +4,10 @@ TESTS_SUBDIRS+= common +.if ${MACHINE_CPUARCH} == "i386" +TESTS_SUBDIRS+= i386 +.endif + .PATH: ${SRCTOP}/tests KYUAFILE= yes Modified: stable/12/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh ============================================================================== --- stable/12/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Thu May 30 15:17:35 2019 (r348427) +++ stable/12/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Thu May 30 15:20:20 2019 (r348428) @@ -24,9 +24,10 @@ fmtflist() genmakefile() { - local basedir=$1 + local class=$1 + local group=$2 - local tdir=${CONTRIB_TESTDIR}/${basedir} + local tdir=${CONTRIB_TESTDIR}/${class}/${group} local tfiles=$(find $tdir -type f -a \ \( -name \*.d -o -name \*.ksh -o -name \*.out \) | sort | fmtflist) local tcfiles=$(find $tdir -type f -a -name \*.c | sort | fmtflist) @@ -34,7 +35,7 @@ genmakefile() # One-off variable definitions. local special - case "$basedir" in + case "$group" in proc) special=" LIBADD.tst.sigwait.exe+= rt @@ -80,7 +81,7 @@ $special .include "../../dtrace.test.mk" __EOF__ - mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile + mv -f $makefile ${ORIGINDIR}/../${class}/${group}/Makefile } set -e @@ -93,9 +94,10 @@ export LC_ALL=C readonly ORIGINDIR=$(realpath $(dirname $0)) readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..) -readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common +readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst -# Generate a Makefile for each test group under common/. -for dir in $(find ${CONTRIB_TESTDIR} -mindepth 1 -maxdepth 1 -type d); do - genmakefile $(basename $dir) +for class in common i386; do + for group in $(find ${CONTRIB_TESTDIR}/$class -mindepth 1 -maxdepth 1 -type d); do + genmakefile $class $(basename $group) + done done Modified: stable/12/etc/mtree/BSD.tests.dist ============================================================================== --- stable/12/etc/mtree/BSD.tests.dist Thu May 30 15:17:35 2019 (r348427) +++ stable/12/etc/mtree/BSD.tests.dist Thu May 30 15:20:20 2019 (r348428) @@ -238,6 +238,16 @@ version .. .. + i386 + arrays + .. + funcs + .. + pid + .. + ustack + .. + .. .. zfsd ..