Details

Reviewers

markj
cem
vangyzen
gnn

Commits

rS360476: dtrace tests: Support globbing for excludes

Summary

Downstream this makes skipping tests like common/ip/tst.*sctp*.ksh simpler.

Sponsored by: Dell EMC

Test Plan

With this in cddl/usr.sbin/dtrace/tests/tools/exclude.sh:

exclude EXFAIL common/ip/tst.*sctp*.ksh

t_dtrace_contrib:tst_ipv4localicmp_ksh  ->  passed  [0.599s]
t_dtrace_contrib:tst_ipv4localsctp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.553s]
t_dtrace_contrib:tst_ipv4localtcp_ksh  ->  passed  [2.739s]
t_dtrace_contrib:tst_ipv4localudp_ksh  ->  passed  [2.751s]
t_dtrace_contrib:tst_ipv4localudplite_ksh  ->  passed  [2.698s]
t_dtrace_contrib:tst_ipv4remoteicmp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.054s]
t_dtrace_contrib:tst_ipv4remotesctp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.043s]
t_dtrace_contrib:tst_ipv4remotetcp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.049s]
t_dtrace_contrib:tst_ipv4remoteudp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.043s]
t_dtrace_contrib:tst_ipv4remoteudplite_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.061s]
t_dtrace_contrib:tst_ipv6localicmp_ksh  ->  passed  [0.603s]
t_dtrace_contrib:tst_ipv6remoteicmp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.048s]
t_dtrace_contrib:tst_localsctpstate_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.586s]
t_dtrace_contrib:tst_localtcpstate_ksh  ->  passed  [2.673s]
t_dtrace_contrib:tst_remotesctpstate_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.060s]
t_dtrace_contrib:tst_remotetcpstate_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.040s]

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 30798
Build 28521: arc lint + arc unit

Event Timeline

bdrewery requested review of this revision.Apr 28 2020, 9:27 PM

bdrewery created this revision.

Harbormaster completed remote builds in B30781: Diff 71128.Apr 28 2020, 9:27 PM

Meant to remove the default TESTBASE before submitting.

Harbormaster completed remote builds in B30782: Diff 71129.Apr 28 2020, 9:30 PM

vangyzen added inline comments.Apr 28 2020, 9:36 PM

cddl/usr.sbin/dtrace/tests/tools/exclude.sh
36	If the glob fails, say due to a typo, this will infinitely recurse.

Handle invalid globs

Invalid exclude for common/ip/tst.*sctp*.ksh*blah

Harbormaster completed remote builds in B30784: Diff 71131.Apr 28 2020, 9:45 PM

vangyzen accepted this revision.Apr 28 2020, 9:59 PM

This revision is now accepted and ready to land.Apr 28 2020, 9:59 PM

I like the idea. I can't say I read shell well enough to review the implementation much.

markj accepted this revision.Apr 29 2020, 2:00 PM

markj added inline comments.

cddl/usr.sbin/dtrace/tests/dtrace.test.mk
22–23	Why do we need :Q?
cddl/usr.sbin/dtrace/tests/tools/exclude.sh
41	I think the other files in this dir indent by four spaces.

bdrewery marked an inline comment as done.Apr 29 2020, 4:36 PM

bdrewery added inline comments.

cddl/usr.sbin/dtrace/tests/dtrace.test.mk
22–23	SRCTOP may have spaces in it.
cddl/usr.sbin/dtrace/tests/tools/exclude.sh
41	True. I noticed but only 1 line had it in this file so I dumped it as my vim was unhappy. I can keep the same style as the directory though.