From owner-svn-src-all@freebsd.org Wed Apr 29 21:12:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 06E092C2C05; Wed, 29 Apr 2020 21:12:33 +0000 (UTC) (envelope-from bdrewery@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 49CB6m6NFfz3Kt4; Wed, 29 Apr 2020 21:12:32 +0000 (UTC) (envelope-from bdrewery@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 D63AEBF33; Wed, 29 Apr 2020 21:12:32 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03TLCWQB003687; Wed, 29 Apr 2020 21:12:32 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03TLCWck003685; Wed, 29 Apr 2020 21:12:32 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202004292112.03TLCWck003685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 29 Apr 2020 21:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360476 - in head/cddl/usr.sbin/dtrace/tests: . tools X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/cddl/usr.sbin/dtrace/tests: . tools X-SVN-Commit-Revision: 360476 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.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: Wed, 29 Apr 2020 21:12:33 -0000 Author: bdrewery Date: Wed Apr 29 21:12:32 2020 New Revision: 360476 URL: https://svnweb.freebsd.org/changeset/base/360476 Log: dtrace tests: Support globbing for excludes Downstream this makes skipping tests like common/ip/tst.*sctp*.ksh simpler. Reviewed by: vangyzen, cem, markj Sponsored by: Dell EMC Differential Revision: https://reviews.freebsd.org/D24608 Modified: head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk head/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Modified: head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk Wed Apr 29 19:28:56 2020 (r360475) +++ head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk Wed Apr 29 21:12:32 2020 (r360476) @@ -1,7 +1,8 @@ # $FreeBSD$ TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} -TESTSRC= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} +TESTBASE= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst +TESTSRC= ${TESTBASE}/${TESTGROUP} TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} FILESGROUPS+= ${TESTGROUP}EXE @@ -18,7 +19,8 @@ TEST_METADATA.t_dtrace_contrib+= required_user="root" GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh ${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES} - sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${PACKAGE}FILES:S/ */ /} > ${.TARGET} + env TESTBASE=${TESTBASE:Q} \ + sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${PACKAGE}FILES:S/ */ /} > ${.TARGET} CLEANFILES+= ${TESTWRAPPER}.sh Modified: head/cddl/usr.sbin/dtrace/tests/tools/exclude.sh ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Wed Apr 29 19:28:56 2020 (r360475) +++ head/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Wed Apr 29 21:12:32 2020 (r360476) @@ -23,7 +23,22 @@ exclude() { - eval $1=\"\$$1\\n$2\" + case $2 in + # Handle globbing later + *"*"*) ;; + # No globbing needed + *) + eval $1=\"\$$1\\n$2\" + return + ;; + esac + for file in ${TESTBASE}/${2}; do + case ${file} in + # Invalid glob + "${TESTBASE}/${2}") echo "Invalid exclude for $2" >&2; exit 1; ;; + esac + exclude "$1" "${file##${TESTBASE}/}" + done } exclude EXFAIL common/aggs/tst.subr.d