The branch main has been updated by christos:
URL:
https://cgit.FreeBSD.org/src/commit/?id=911f0260390e18cf85f3dbf2c719b593efdc1e3c
commit 911f0260390e18cf85f3dbf2c719b593efdc1e3c
Author: Christos Margiolis <chris...@freebsd.org>
AuthorDate: 2023-07-04 15:46:59 +0000
Commit: Christos Margiolis <chris...@freebsd.org>
CommitDate: 2023-07-04 15:46:59 +0000
dtrace: move kinst tests to common
Reviewed by: markj
Approved by: markj (mentor)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40414
---
.../cmd/dtrace/test/tst/{amd64 => common}/kinst/tst.basic.ksh | 0
cddl/usr.sbin/dtrace/tests/amd64/Makefile | 3 +--
cddl/usr.sbin/dtrace/tests/common/Makefile | 1 +
cddl/usr.sbin/dtrace/tests/{amd64 => common}/kinst/Makefile | 0
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/amd64/kinst/tst.basic.ksh
b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/kinst/tst.basic.ksh
similarity index 100%
rename from
cddl/contrib/opensolaris/cmd/dtrace/test/tst/amd64/kinst/tst.basic.ksh
rename to
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/kinst/tst.basic.ksh
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/Makefile
b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
index db421ea0880f..39ccd333bedf 100644
--- a/cddl/usr.sbin/dtrace/tests/amd64/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/amd64
-TESTS_SUBDIRS+= arrays \
- kinst
+TESTS_SUBDIRS+= arrays
.PATH: ${.CURDIR:H:H:H:H:H}/tests
KYUAFILE= YES
diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile
b/cddl/usr.sbin/dtrace/tests/common/Makefile
index c395269e7aa9..1b552bf56889 100644
--- a/cddl/usr.sbin/dtrace/tests/common/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/Makefile
@@ -32,6 +32,7 @@ TESTS_SUBDIRS+= aggs \
ip \
java_api \
json \
+ kinst \
lexer \
llquantize \
mdb \
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/kinst/Makefile
b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
similarity index 100%
rename from cddl/usr.sbin/dtrace/tests/amd64/kinst/Makefile
rename to cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
