Date: Thu, 30 May 2019 15:20:20 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> 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 Message-ID: <201905301520.x4UFKKG0025628@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 ..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905301520.x4UFKKG0025628>